Bug 1394582 - Don't hang forever in the stub installer if the browser was already running. r?agashlin draft
authorMatt Howell <mhowell@mozilla.com>
Mon, 28 Aug 2017 15:12:33 -0700
changeset 654447 beea8b4ae7a35b1160659ac847a8a31c01b39ee0
parent 653118 56188620cce00b19700fbb8efaafea65e6ca8c61
child 728582 e16426fefad976eb4193c6ec60cc21d3fa1aed3a
push id76593
push usermhowell@mozilla.com
push dateMon, 28 Aug 2017 22:14:03 +0000
reviewersagashlin
bugs1394582, 1376597
milestone57.0a1
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"