Bug 1394582 - Don't hang forever in the stub installer if the browser was already running. r=agashlin
authorMatt Howell <mhowell@mozilla.com>
Mon, 28 Aug 2017 15:12:33 -0700
changeset 377413 2d61e13b6032faa42a9f11e84b8e7a23daae842c
parent 377412 4bb4b46fcc614934800c108cc66e61afd3b67843
child 377414 dbf3f883ef65a51c88487b431ef53a72af0b3b0d
push id49907
push usermhowell@mozilla.com
push dateTue, 29 Aug 2017 14:54:14 +0000
treeherderautoland@2d61e13b6032 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersagashlin
bugs1394582, 1376597
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1394582 - Don't hang forever in the stub installer if the browser was already running. r=agashlin Fixes a regression from bug 1376597, which caused the stub installer to hang forever and not respond to the close button if the browser was already running during the installation. MozReview-Commit-ID: A1XWGvnlgrS
browser/installer/windows/nsis/stub.nsi
--- a/browser/installer/windows/nsis/stub.nsi
+++ b/browser/installer/windows/nsis/stub.nsi
@@ -1568,16 +1568,17 @@ Function CanWrite
 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)"
+    Call SendPing
     Return
   ${EndIf}
 !endif
 
   StrCpy $FirefoxLaunchCode "2"
 
   ; Set the current working directory to the installation directory
   SetOutPath "$INSTDIR"