Updating tag superf4-1.2 to account for post-release issue (r209).

stefansundin · Oct 23, 2010 · cd5a702 · cd5a702
2 parents feacc7c + 054c244
commit cd5a702
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/installer.nsi b/installer.nsi
@@ -243,8 +243,11 @@ Function .onInit
 	;Detect x64
 	!ifdef x64
 	${If} ${RunningX64}
-		StrCpy $INSTDIR "$PROGRAMFILES64\${APP_NAME}"
 		SectionSetText ${sec_app} "${APP_NAME} (x64)"
+		;Only set x64 installation dir if not already installed
+		ReadRegStr $0 HKCU "Software\${APP_NAME}" "Install_Dir"
+		IfFileExists $0 +2
+			StrCpy $INSTDIR "$PROGRAMFILES64\${APP_NAME}"
 	${EndIf}
 	!endif
 	;Display language selection and add tray if program is running

diff --git a/localization/en-US/info.txt b/localization/en-US/info.txt
@@ -21,7 +21,7 @@ Changelog
 ---------
 1.2 - 2010-10-23:
 Added 64-bit executable. The installer will automatically install the correct executable.
-Added support for alternative Ctrl+Alt+F4 detection (see SuperF4.ini). Enables this to make SuperF4 work in StarCraft II.
+Added support for alternative Ctrl+Alt+F4 detection (see SuperF4.ini). Enable this to make SuperF4 work in StarCraft II.
 Added xkill to the tray menu (Win+F4).
 Added manual update check to the tray menu.
 Fixed the Shell_NotifyIcon error that appeared for some when SuperF4 was on autostart.