The windows installer shouldn't bypasses the profile selection logic when it tries to launch the installed app (bug 1091605). r=rstrong

This commit is contained in:
Panos Astithas 2014-10-31 22:10:10 +02:00
parent 177512d024
commit 581096ec32
3 changed files with 7 additions and 0 deletions

View File

@ -42,3 +42,6 @@
!define COMMON_TEXT_COLOR_NORMAL 0xFFFFFF
!define COMMON_TEXT_COLOR_FADED 0xA1AAB3
!define COMMON_BKGRD_COLOR 0x0F1B26
# Enable DeveloperEdition-specific behavior
!define DEV_EDITION

View File

@ -769,7 +769,9 @@ Function CheckExistingInstall
FunctionEnd
Function LaunchApp
!ifndef DEV_EDITION
${ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)"
!endif
ClearErrors
${GetParameters} $0

View File

@ -1915,12 +1915,14 @@ Function ExecSetAsDefaultAppUser
FunctionEnd
Function LaunchApp
!ifndef DEV_EDITION
FindWindow $0 "${WindowClass}"
${If} $0 <> 0 ; integer comparison
StrCpy $FirefoxLaunchCode "1"
MessageBox MB_OK|MB_ICONQUESTION "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)"
Return
${EndIf}
!endif
StrCpy $FirefoxLaunchCode "2"