Bug 1601806 - Remove installer check for running instances before launching new instance. r=agashlin

At the end of any successful install, both the stub installer and full installer
(in interactive mode) attempt to launch the newly installed copy. But currently,
they first check if any copy of Firefox [1] is already running, and skip doing
that launch if so. The reason for this is that it used to be the case that no
two instances of Firefox could ever be running under default conditions because
there was only one default profile and it would be in use. It's clear that this
is the reason for the check because an exception is made for Developer Edition,
which had its own default profile and so wasn't subject to this restriction.

But now, we have per-install profiles by default, so there's no longer any need
to have this check, because launching the new instance won't be blocked by the
fact that there's already an instance running; all we're doing is creating
false positive prompts for something that isn't an issue anymore. So, this
patch removes the check and the prompt.

[1] At least that's the intent, but because of bug 1600905 we're actually now
checking for any Gecko-based product, because that's the best we can now do.

Differential Revision: https://phabricator.services.mozilla.com/D56959

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Molly Howell 2019-12-20 21:40:07 +00:00
parent 810b6b879b
commit 469e70dc6d
4 changed files with 0 additions and 23 deletions

View File

@ -945,11 +945,6 @@ Function CheckExistingInstall
FunctionEnd
Function LaunchApp
!ifndef DEV_EDITION
${ManualCloseAppPrompt} "${MainWindowClass}" "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)"
${ManualCloseAppPrompt} "${DialogWindowClass}" "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)"
!endif
ClearErrors
${GetParameters} $0
${GetOptions} "$0" "/UAC:" $1

View File

@ -1766,22 +1766,6 @@ Function CanWrite
FunctionEnd
Function LaunchApp
!ifndef DEV_EDITION
FindWindow $0 "${MainWindowClass}"
FindWindow $1 "${DialogWindowClass}"
${If} $0 <> 0 ; integer comparison
${OrIf} $1 <> 0
StrCpy $FirefoxLaunchCode "1"
StrCpy $ProgressCompleted ${PROGRESS_BAR_TOTAL_STEPS}
Call SetProgressBars
MessageBox MB_OK|MB_ICONQUESTION "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)"
Call SendPing
Return
${EndIf}
!endif
StrCpy $FirefoxLaunchCode "2"
; Set the current working directory to the installation directory

View File

@ -45,7 +45,6 @@ ICONS_STARTMENU=In my &Start Menu Programs folder
ICONS_QUICKLAUNCH=In my &Quick Launch bar
WARN_MANUALLY_CLOSE_APP_INSTALL=$BrandShortName must be closed to proceed with the installation.\n\nPlease close $BrandShortName to continue.
WARN_MANUALLY_CLOSE_APP_UNINSTALL=$BrandShortName must be closed to proceed with the uninstall.\n\nPlease close $BrandShortName to continue.
WARN_MANUALLY_CLOSE_APP_LAUNCH=$BrandShortName is already running.\n\nPlease close $BrandShortName prior to launching the version you have just installed.
WARN_WRITE_ACCESS=You don't have access to write to the installation directory.\n\nClick OK to select a different directory.
WARN_DISK_SPACE=You don't have sufficient disk space to install to this location.\n\nClick OK to select a different location.
WARN_MIN_SUPPORTED_OSVER_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer. Please click the OK button for additional information.

View File

@ -43,7 +43,6 @@ WARN_MIN_SUPPORTED_CPU_MSG=Sorry, $BrandShortName cant be installed. This ver
WARN_MIN_SUPPORTED_OSVER_CPU_MSG=Sorry, $BrandShortName cant be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer and a processor with ${MinSupportedCPU} support. Please click the OK button for additional information.
WARN_WRITE_ACCESS_QUIT=You dont have access to write to the installation directory
WARN_DISK_SPACE_QUIT=You dont have sufficient disk space to install.
WARN_MANUALLY_CLOSE_APP_LAUNCH=$BrandShortName is already running.\n\nPlease close $BrandShortName prior to launching the version you have just installed.
ERROR_DOWNLOAD_CONT=Hmm. For some reason, we could not install $BrandShortName.\nChoose OK to start over.