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

Fix for bug 141035. Application must quit if the .cfg file is required but does not exist. r=ccarlen, sgehani. sr=alecf, beard, dveditz. a=valeski. adt=putterman.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_0_BRANCH@123878 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bnesse%netscape.com
2002-06-22 20:43:33 +00:00
parent ff1b8f2964
commit 42936b4b40
19 changed files with 71 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,8 @@ nsAppShellService::nsAppShellService() :
mNativeAppSupport( nsnull ),
mModalWindowCount( 0 ),
mShuttingDown( PR_FALSE ),
mQuitOnLastWindowClosing( PR_TRUE )
mQuitOnLastWindowClosing( PR_TRUE ),
mInProfileStartup( PR_FALSE )
{
NS_INIT_REFCNT();
}
@@ -242,6 +243,7 @@ nsAppShellService::DoProfileStartup(nsICmdLineService *aCmdLineService, PRBool c
nsCOMPtr<nsIProfileInternal> profileMgr(do_GetService(NS_PROFILE_CONTRACTID, &rv));
NS_ENSURE_SUCCESS(rv,rv);
mInProfileStartup = PR_TRUE;
PRBool saveQuitOnLastWindowClosing = mQuitOnLastWindowClosing;
mQuitOnLastWindowClosing = PR_FALSE;
@@ -259,6 +261,11 @@ nsAppShellService::DoProfileStartup(nsICmdLineService *aCmdLineService, PRBool c
}
mQuitOnLastWindowClosing = saveQuitOnLastWindowClosing;
mInProfileStartup = PR_FALSE;
// if Quit() was called while we were starting up we have a failure situation...
if (mShuttingDown)
return NS_ERROR_FAILURE;
return rv;
}
@@ -553,7 +560,9 @@ nsAppShellService::HandleExitEvent(PLEvent* aEvent)
event->mService->mAppShell->Exit();
// We're done "shutting down".
event->mService->mShuttingDown = PR_FALSE;
// unless we are currently "starting up" in which case this event wasn't properly handled.
if (!event->mService->mInProfileStartup)
event->mService->mShuttingDown = PR_FALSE;
return nsnull;
}