My last fix for the SectionTheme bug fixed that particular bug but in…

…troduced a new one. Hopefully that new bug is now fixed. (You would get the wrong themeslist.rc and themeselect.rc files when installing on a computer that didn't already have losi installed)

HiddenSectionTheme.nsh

@@ -0,0 +1,23 @@
+!ifndef HIDDEN_SECTION_THEME
+!define HIDDEN_SECTION_THEME
+	!include LogicLib.nsh
+
+	Section "-HiddenSectionTheme"
+		; OTS2 Theme files
+		IfFileExists "$whereprofiles\themes\themeslist.rc" 0 AddThemeFiles
+			IfFileExists "$whereprofiles\themes\themeselect.rc" SkipThemeFiles
+
+		AddThemeFiles:
+		SetOutPath  "$whereprofiles\themes\"
+		!insertmacro UNINSTALL.LOG_OPEN_INSTALL
+		${If} ${SectionIsSelected} ${SecTheme}
+			File ".\Personal\themes\themeselect.rc"
+			File ".\Personal\themes\themeslist.rc"
+		${Else}
+			File /oname=themeselect.rc ".\Personal\themes\themeselect-empty.rc"
+			File /oname=themeslist.rc ".\Personal\themes\themeslist-empty.rc"
+		${EndIf}
+		!insertmacro UNINSTALL.LOG_CLOSE_INSTALL
+		SkipThemeFiles:
+	SectionEnd
+!endif

LOSI.nsi

@@ -116,6 +116,7 @@ ShowUnInstDetails show
 !include PagePreviousInstall.nsh
 !include SectionCore.nsh
 !include SectionTheme.nsh
+!include HiddenSectionTheme.nsh
 !include SectionLOSI.nsh
 !include PageHowLS.nsh
 !include PageWhereProfiles.nsh

SectionCore.nsh

@@ -81,18 +81,6 @@
 			WriteRegStr HKLM "Software\${PRODUCT_NAME}\Installer" "ProfilesDir" $whereprofiles
 		WriteRegStr HKLM "Software\${PRODUCT_NAME}\Installer" "PersonalDir" "$whereprofiles\personal"
 
-		; OTS2 Theme files
-		IfFileExists "$whereprofiles\themes\themeslist.rc" 0 AddThemeFiles
-			IfFileExists "$whereprofiles\themes\themeselect.rc" SkipThemeFiles
-
-		AddThemeFiles:
-		SetOutPath  "$whereprofiles\themes\"
-		!insertmacro UNINSTALL.LOG_OPEN_INSTALL
-		File /oname=themeselect.rc ".\Personal\themes\themeselect-empty.rc"
-		File /oname=themeslist.rc ".\Personal\themes\themeslist-empty.rc"
-		!insertmacro UNINSTALL.LOG_CLOSE_INSTALL
-		SkipThemeFiles:
-
 		SetOutPath "$INSTDIR"
 		!insertmacro UNINSTALL.LOG_OPEN_INSTALL
 		File ".\LS\changes.txt"