Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 798861 - Stub installer: Firefox is already dialog does not appear on front when it pops up, which makes the stub look like it's hung. r=bbondy

Browse Source
This commit is contained in:
Robert Strong 2012-10-10 02:10:58 -07:00
parent a9295dd2c0
commit 01fb0270d8
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
browser/installer/windows/nsis/stub.nsi
View File

@ -1204,15 +1204,16 @@ Function ExecSetAsDefaultAppUser
FunctionEnd
Function LaunchApp
FindWindow $0 "${WindowClass}"
${If} $0 <> 0 ; integer comparison
MessageBox MB_OK|MB_ICONQUESTION "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)"
Return
${EndIf}
ClearErrors
${GetParameters} $0
${GetOptions} "$0" "/UAC:" $1
${If} ${Errors}
FindWindow $0 "${WindowClass}"
${If} $0 <> 0 ; integer comparison
MessageBox MB_OK|MB_ICONQUESTION "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)"
Return
${EndIf}
Exec "$\"$INSTDIR\${FileMainEXE}$\""
${Else}
GetFunctionAddress $0 LaunchAppFromElevatedProcess
@ -1221,12 +1222,6 @@ Function LaunchApp
FunctionEnd
Function LaunchAppFromElevatedProcess
FindWindow $0 "${WindowClass}"
${If} $0 <> 0 ; integer comparison
MessageBox MB_OK|MB_ICONQUESTION "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)"
Return
${EndIf}
; Find the installation directory when launching using GetFunctionAddress
; from an elevated installer since $INSTDIR will not be set in this installer
${StrFilter} "${FileMainEXE}" "+" "" "" $R9