зеркало из https://github.com/mozilla/gecko-dev.git
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:
Родитель
36daaf9002
Коммит
58f7caecb2
|
@ -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
|
||||
|
|
|
@ -769,7 +769,9 @@ Function CheckExistingInstall
|
|||
FunctionEnd
|
||||
|
||||
Function LaunchApp
|
||||
!ifndef DEV_EDITION
|
||||
${ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)"
|
||||
!endif
|
||||
|
||||
ClearErrors
|
||||
${GetParameters} $0
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче