From 401d7d0f92b60500bf62cbf98f6f0ab7d1aaadee Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Tue, 22 Dec 2020 16:09:51 +0100
Subject: [PATCH] makepackage: Fix error in installer.nsi

---
 makepanda/installer.nsi | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/makepanda/installer.nsi b/makepanda/installer.nsi
index 0e401865dc..04b3201388 100644
--- a/makepanda/installer.nsi
+++ b/makepanda/installer.nsi
@@ -423,32 +423,16 @@ SectionGroup "Python modules" SecGroupPython
         !insertmacro PyBindingSection 3.6-32 .cp36-win32.pyd
         !insertmacro PyBindingSection 3.7-32 .cp37-win32.pyd
         !insertmacro PyBindingSection 3.8-32 .cp38-win32.pyd
-        ${If} ${AtLeastWin8}
         !insertmacro PyBindingSection 3.9-32 .cp39-win32.pyd
         !insertmacro PyBindingSection 3.10-32 .cp310-win32.pyd
-        ${EndIf}
     !else
         !insertmacro PyBindingSection 3.5 .cp35-win_amd64.pyd
         !insertmacro PyBindingSection 3.6 .cp36-win_amd64.pyd
         !insertmacro PyBindingSection 3.7 .cp37-win_amd64.pyd
         !insertmacro PyBindingSection 3.8 .cp38-win_amd64.pyd
-        ${If} ${AtLeastWin8}
         !insertmacro PyBindingSection 3.9 .cp39-win_amd64.pyd
         !insertmacro PyBindingSection 3.10 .cp310-win_amd64.pyd
-        ${EndIf}
     !endif
-
-    ; These versions of Python require Windows 8.1 or higher.
-    ${Unless} ${AtLeastWin8}
-    !ifdef SecPyBindings3.9
-        SectionSetFlags ${SecPyBindings3.9} ${SF_RO}
-        SectionSetInstTypes ${SecPyBindings3.9} 0
-    !endif
-    !ifdef SecPyBindings3.10
-        SectionSetFlags ${SecPyBindings3.10} ${SF_RO}
-        SectionSetInstTypes ${SecPyBindings3.10} 0
-    !endif
-    ${EndUnless}
 SectionGroupEnd
 
 !ifdef INCLUDE_PYVER
@@ -553,16 +537,32 @@ Function .onInit
         !insertmacro MaybeEnablePyBindingSection 3.6-32
         !insertmacro MaybeEnablePyBindingSection 3.7-32
         !insertmacro MaybeEnablePyBindingSection 3.8-32
+        ${If} ${AtLeastWin8}
         !insertmacro MaybeEnablePyBindingSection 3.9-32
         !insertmacro MaybeEnablePyBindingSection 3.10-32
+        ${EndIf}
     !else
         !insertmacro MaybeEnablePyBindingSection 3.5
         !insertmacro MaybeEnablePyBindingSection 3.6
         !insertmacro MaybeEnablePyBindingSection 3.7
         !insertmacro MaybeEnablePyBindingSection 3.8
+        ${If} ${AtLeastWin8}
         !insertmacro MaybeEnablePyBindingSection 3.9
         !insertmacro MaybeEnablePyBindingSection 3.10
+        ${EndIf}
     !endif
+
+    ; These versions of Python require Windows 8.1 or higher.
+    ${Unless} ${AtLeastWin8}
+    !ifdef SecPyBindings3.9
+        SectionSetFlags ${SecPyBindings3.9} ${SF_RO}
+        SectionSetInstTypes ${SecPyBindings3.9} 0
+    !endif
+    !ifdef SecPyBindings3.10
+        SectionSetFlags ${SecPyBindings3.10} ${SF_RO}
+        SectionSetInstTypes ${SecPyBindings3.10} 0
+    !endif
+    ${EndUnless}
 FunctionEnd
 
 Function .onSelChange