From 6472e40a8c35f6d2bbe059c85fe9ffdd5731e8bb Mon Sep 17 00:00:00 2001 From: "blakeross%telocity.com" Date: Sun, 13 Oct 2002 03:51:29 +0000 Subject: [PATCH] move phoenix obs notification, NPOB. r=hewitt/sr=hyatt git-svn-id: svn://10.0.0.236/trunk@131894 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/appshell/src/nsAppShellService.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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) {