Bug 951908 - Ensure child processes shut down propertly on Macs. r=bent, r=smichaud, a=lsblakk
authorBill McCloskey <wmccloskey@mozilla.com>
Wed, 15 Jan 2014 13:09:41 -0800
changeset 175859 6b861c14640bd080b479409e866347ec00de5b3e
parent 175858 c39ef9346edef94843be47d41dfe4d8fcf2d1fe0
child 175860 c61a1dd23ef233480bcf240cf406869291bf3ac6
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbent, smichaud, lsblakk
bugs951908
milestone28.0a2
Bug 951908 - Ensure child processes shut down propertly on Macs. r=bent, r=smichaud, a=lsblakk
widget/cocoa/nsAppShell.mm
--- a/widget/cocoa/nsAppShell.mm
+++ b/widget/cocoa/nsAppShell.mm
@@ -730,17 +730,17 @@ nsAppShell::InGeckoMainEventLoop()
 // Camino calls [NSApp run] on its own (via NSApplicationMain()), and so
 // doesn't call nsAppShell::Run().
 //
 // public
 NS_IMETHODIMP
 nsAppShell::Run(void)
 {
   NS_ASSERTION(!mStarted, "nsAppShell::Run() called multiple times");
-  if (mStarted)
+  if (mStarted || mTerminated)
     return NS_OK;
 
   mStarted = true;
   NS_OBJC_TRY_ABORT([NSApp run]);
 
   return NS_OK;
 }