From 3e7fedbb25167c94ca2c17a1037304606f2da8e1 Mon Sep 17 00:00:00 2001 From: "neil%parkwaycc.co.uk" Date: Tue, 19 Jul 2005 23:22:42 +0000 Subject: [PATCH] Bug 301082 xpcom-shutdown is too late to destroy cached compose window; instead use quit-application which guards against reentrancy r+sr=bienvenu a=bsmedberg --- mailnews/compose/src/nsMsgComposeService.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mailnews/compose/src/nsMsgComposeService.cpp b/mailnews/compose/src/nsMsgComposeService.cpp index a82c7d08df89..e0b200bac7ef 100644 --- a/mailnews/compose/src/nsMsgComposeService.cpp +++ b/mailnews/compose/src/nsMsgComposeService.cpp @@ -186,7 +186,7 @@ nsresult nsMsgComposeService::Init() nsCOMPtr observerService = do_GetService("@mozilla.org/observer-service;1", &rv); if (NS_SUCCEEDED(rv)) { - rv = observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_TRUE); + rv = observerService->AddObserver(this, "quit-application", PR_TRUE); rv = observerService->AddObserver(this, "profile-do-change", PR_TRUE); } @@ -335,7 +335,7 @@ void nsMsgComposeService::CloseWindow(nsIDOMWindowInternal *domWindow) NS_IMETHODIMP nsMsgComposeService::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData) { - if (!strcmp(aTopic,"profile-do-change") || !strcmp(aTopic,NS_XPCOM_SHUTDOWN_OBSERVER_ID)) + if (!strcmp(aTopic, "profile-do-change") || !strcmp(aTopic, "quit-application")) { DeleteCachedWindows(); return NS_OK;