This fixes the installer to not append \Winamp to non-default paths a…

…nd will correctly ask to close running Winamp instances related to the changed install location
Gargaj · Jul 29, 2016 · 1e0c5bd · 1e0c5bd
1 parent 610d2b5
commit 1e0c5bd
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/installer.nsi b/installer.nsi
@@ -49,7 +49,7 @@ UninstallIcon "..\installer.ico"
 !insertmacro GetSize
 
 ; The default installation directory
-InstallDir $PROGRAMFILES\Winamp
+InstallDir "$PROGRAMFILES\Winamp\"
 InstProgressFlags smooth
 
 ; detect Winamp path from uninstall string if available
@@ -131,14 +131,13 @@ process:
   Delete $R3
 FunctionEnd
 
-Function .onInit
-  Call FindAndCloseWinamp
-FunctionEnd
-
 ;--------------------------------
 
 Function directoryLeave
+  ; check that it's a supported Winamp version
   Call CheckWinampVersion
+  ; and if it is then ensure it's not running
+  Call FindAndCloseWinamp
 FunctionEnd
 
 Function .onInstSuccess