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

quit() now returns no error under normal circumstances. bug 185360 r=jag,neil

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@152982 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
danm-moz%comcast.net 2004-02-19 23:03:13 +00:00
parent dfe0786e74
commit 3c79dd8967
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -499,8 +499,10 @@ nsAppShellService::Quit(PRUint32 aFerocity)
/* eForceQuit doesn't actually work; it can cause a subtle crash if
there are windows open which have unload handlers which open
new windows. Use eAttemptQuit for now. */
if (aFerocity == eForceQuit)
return NS_ERROR_FAILURE;
if (aFerocity == eForceQuit) {
NS_WARNING("attempted to force quit");
// it will be treated the same as eAttemptQuit, below
}
mShuttingDown = PR_TRUE;
@ -583,9 +585,21 @@ nsAppShellService::Quit(PRUint32 aFerocity)
mWindowMediator->GetEnumerator(nsnull, getter_AddRefs(windowEnumerator));
if (windowEnumerator) {
PRBool more;
if (NS_SUCCEEDED(windowEnumerator->HasMoreElements(&more)) && more) {
while (windowEnumerator->HasMoreElements(&more), more) {
/* we can't quit immediately. we'll try again as the last window
finally closes. */
aFerocity = eAttemptQuit;
rv = NS_ERROR_FAILURE;
nsCOMPtr<nsISupports> window;
windowEnumerator->GetNext(getter_AddRefs(window));
nsCOMPtr<nsIDOMWindowInternal> domWindow(do_QueryInterface(window));
if (domWindow) {
PRBool closed = PR_FALSE;
domWindow->GetClosed(&closed);
if (!closed) {
rv = NS_ERROR_FAILURE;
break;
}
}
}
}
}