Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for 149754. cleaner xpcom shutdown. r=rpotts, sr=shaver

Browse Source
This commit is contained in:
dougt%netscape.com 2002-06-11 19:38:41 +00:00
parent a92c2a61bd
commit e202a87635
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xpcom/glue/nsMemory.cpp
View File

@ -42,17 +42,15 @@
static nsIMemory* gMemory = nsnull;
static PRBool gHasMemoryShutdown = PR_FALSE;
static NS_METHOD FreeGlobalMemory(void)
{
NS_IF_RELEASE(gMemory);
gHasMemoryShutdown = PR_TRUE;
return NS_OK;
}
#define ENSURE_ALLOCATOR \
(gMemory ? PR_TRUE : !gHasMemoryShutdown && SetupGlobalMemory())
(gMemory ? PR_TRUE : (PRBool) SetupGlobalMemory())
static nsIMemory*
SetupGlobalMemory()

3
xpcom/io/nsDirectoryService.cpp
View File

@ -590,7 +590,8 @@ nsDirectoryService::~nsDirectoryService()
NS_IF_RELEASE(nsDirectoryService::sSystemDirectory);
#endif
// clear the global
mService = nsnull;
}