// PENDING(edburns): HACK workaround for bug 59530. This
// workaround forces the nsBookmarksService to leak so that it
// never gets destructed, thus the timer never gets canceled and
// thus the fact that the static nsCOMPtr instance has gone away
// doesn't matter.
The following files are in this fix:
M src_moz/CBrowserContainer.cpp
M src_moz/CBrowserContainer.h
M src_moz/WindowControlActionEvents.cpp
M src_moz/rdf_util.cpp
M src_moz/wcIBrowserContainer.h
author=edburns
r=ashuk
git-svn-id: svn://10.0.0.236/branches/JAVADEV_RTM_20001102@86242 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -83,6 +83,12 @@ wsDeallocateInitContextEvent::handleEvent ()
|
||||
if (!mInitContext) {
|
||||
return (void *) NS_ERROR_UNEXPECTED;
|
||||
}
|
||||
PRBool isLastWindow = PR_TRUE;
|
||||
PRInt32 winCount;
|
||||
if (NS_SUCCEEDED(mInitContext->browserContainer->
|
||||
GetInstanceCount(&winCount))) {
|
||||
isLastWindow = (1 == winCount);
|
||||
}
|
||||
|
||||
mInitContext->parentHWnd = nsnull;
|
||||
|
||||
@@ -144,7 +150,12 @@ wsDeallocateInitContextEvent::handleEvent ()
|
||||
util_DeallocateShareInitContext(&(mInitContext->shareContext));
|
||||
|
||||
// delete mInitContext;
|
||||
NS_TermEmbedding();
|
||||
if (isLastWindow) {
|
||||
NS_TermEmbedding();
|
||||
#ifdef _WIN32
|
||||
_exit(0);
|
||||
#endif
|
||||
}
|
||||
return (void *) NS_OK;
|
||||
} // handleEvent()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user