Fix for bug 106585 - crash in XPCOMM.DLL during shutdown when mail-news window was open, r=shaver, sr=dougt

This commit is contained in:
neeti%netscape.com 2001-10-25 21:03:35 +00:00
parent 326707dfd9
commit 92ed1e6c21

View File

@ -480,6 +480,10 @@ nsresult NS_COM NS_ShutdownXPCOM(nsIServiceManager* servMgr)
eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(currentQ));
}
}
// XPCOM is officially in shutdown mode NOW
// Set this only after the observers have been notified as this
// will cause servicemanager to become inaccessible.
gXPCOMShuttingDown = PR_TRUE;
// We may have AddRef'd for the caller of NS_InitXPCOM, so release it
// here again:
@ -494,11 +498,6 @@ nsresult NS_COM NS_ShutdownXPCOM(nsIServiceManager* servMgr)
currentQ = 0;
}
// XPCOM is officially in shutdown mode NOW
// Set this only after the observers have been notified as this
// will cause servicemanager to become inaccessible.
gXPCOMShuttingDown = PR_TRUE;
#ifndef XPCOM_STANDALONE
// Release the global case converter
NS_IF_RELEASE(gCaseConv);