Bug 804971 r=rstrong,a=Standard8
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 24 Oct 2012 21:57:55 +0100
changeset 9909 6c5e9520517a95b4f62ad3466b909a35217d1850
parent 9908 52765de6bf41c298af03d047a80285ce9a31d507
child 9913 eb85dd53fee62466923c52c9186d9e9809c8be6f
push id38
push userbugzilla@standard8.plus.com
push dateWed, 24 Oct 2012 21:05:19 +0000
reviewersrstrong, Standard8
bugs804971
Bug 804971 r=rstrong,a=Standard8
mail/installer/windows/nsis/installer.nsi
--- a/mail/installer/windows/nsis/installer.nsi
+++ b/mail/installer/windows/nsis/installer.nsi
@@ -665,17 +665,17 @@ Function CheckExistingInstall
 FunctionEnd
 
 Function LaunchApp
   ClearErrors
   ${GetParameters} $0
   ${GetOptions} "$0" "/UAC:" $1
   ${If} ${Errors}
     ${ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)"
-    Exec "$INSTDIR\${FileMainEXE}"
+    Exec "$\"$INSTDIR\${FileMainEXE}$\""
   ${Else}
     GetFunctionAddress $0 LaunchAppFromElevatedProcess
     UAC::ExecCodeSegment $0
   ${EndIf}
 FunctionEnd
 
 Function LaunchAppFromElevatedProcess
   ${ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)"
@@ -683,17 +683,17 @@ Function LaunchAppFromElevatedProcess
   ; Find the installation directory when launching using GetFunctionAddress
   ; from an elevated installer since $INSTDIR will not be set in this installer
   ReadRegStr $0 HKLM "Software\Clients\Mail\${ClientsRegName}\DefaultIcon" ""
   ${GetPathFromString} "$0" $0
   ${GetParent} "$0" $1
   ; Set our current working directory to the application's install directory
   ; otherwise the 7-Zip temp directory will be in use and won't be deleted.
   SetOutPath "$1"
-  Exec "$0"
+  Exec "$\"$0$\""
 FunctionEnd
 
 ################################################################################
 # Language
 
 !insertmacro MOZ_MUI_LANGUAGE 'baseLocale'
 !verbose push
 !verbose 3