Bug 1160597 - Full installer fails to launch browser when the installer is finished (stub installer unaffected). r=rstrong

This commit is contained in:
zhoubcfan@163.com 2015-05-04 20:47:25 -07:00
parent d83ebb858a
commit c91113e8ae

View File

@ -795,11 +795,7 @@ Function LaunchApp
${GetParameters} $0
${GetOptions} "$0" "/UAC:" $1
${If} ${Errors}
StrCpy $1 "0"
StrCpy $2 "0"
${If} $1 == "1"
Exec "$\"$INSTDIR\${FileMainEXE}$\""
${EndIf}
Exec "$\"$INSTDIR\${FileMainEXE}$\""
${Else}
GetFunctionAddress $0 LaunchAppFromElevatedProcess
UAC::ExecCodeSegment $0
@ -816,12 +812,7 @@ Function LaunchAppFromElevatedProcess
; 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"
StrCpy $2 "0"
StrCpy $3 "0"
${If} $2 == "1"
; Launch into desktop
Exec "$\"$0$\""
${EndIf}
Exec "$\"$0$\""
FunctionEnd
################################################################################