diff --git a/mozilla/xpfe/appshell/src/nsAppShellService.cpp b/mozilla/xpfe/appshell/src/nsAppShellService.cpp index c51f2cb3ed7..0757f5536f2 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellService.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellService.cpp @@ -520,11 +520,6 @@ nsAppShellService::Quit(PRUint32 aFerocity) } } -#ifdef MOZ_PHOENIX - nsCOMPtr obsService = do_GetService("@mozilla.org/observer-service;1", &rv); - obsService->NotifyObservers(nsnull, "quit-application", nsnull); -#endif - /* Currently aFerocity can never have the value of eForceQuit here. That's temporary (in an unscheduled kind of way) and logically this code is part of the eForceQuit case, so I'm checking against @@ -588,6 +583,11 @@ nsAppShellService::Quit(PRUint32 aFerocity) if (aFerocity == eForceQuit) { // do it! +#ifdef MOZ_PHOENIX + nsCOMPtr obsService = do_GetService("@mozilla.org/observer-service;1", &rv); + obsService->NotifyObservers(nsnull, "quit-application", nsnull); +#endif + // first shutdown native app support; doing this first will prevent new // requests to open additional windows coming in. if (mNativeAppSupport) {