Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

13698 Assertion: "uh oh, couldn't Init() for some reason" (NS_SUCC

Browse Source 
reorder unregister code so this doesn't happen


git-svn-id: svn://10.0.0.236/trunk@47278 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
davidm%netscape.com
1999-09-14 04:22:12 +00:00
parent 8e1f15a95d
commit 21add209a6
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/xpfe/appshell/src/nsAppShellService.cpp
View File

@@ -718,12 +718,7 @@ nsAppShellService::RegisterTopLevelWindow(nsIWebShellWindow* aWindow)
NS_IMETHODIMP
nsAppShellService::UnregisterTopLevelWindow(nsIWebShellWindow* aWindow)
{
nsIWindowMediator* service;
if (NS_SUCCEEDED(nsServiceManager::GetService(kWindowMediatorCID, kIWindowMediatorIID, (nsISupports**) &service ) ) )
{
service->UnregisterWindow( aWindow );
nsServiceManager::ReleaseService(kWindowMediatorCID, service);
}
if (mDeleteCalled) {
// return an error code in order to:
@@ -733,6 +728,13 @@ nsAppShellService::UnregisterTopLevelWindow(nsIWebShellWindow* aWindow)
return NS_ERROR_FAILURE;
}
nsIWindowMediator* service;
if (NS_SUCCEEDED(nsServiceManager::GetService(kWindowMediatorCID, kIWindowMediatorIID, (nsISupports**) &service ) ) )
{
service->UnregisterWindow( aWindow );
nsServiceManager::ReleaseService(kWindowMediatorCID, service);
}
nsresult rv;
nsIWebShellContainer* wsc;