From 14c0dfcc8b01bd32f426877dcc63c1ad1f3be7bf Mon Sep 17 00:00:00 2001
From: "ben%bengoodger.com"
 <ben%bengoodger.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 20 Jun 2004 03:42:50 +0000
Subject: [PATCH] change mDeleteCalled to mXPCOMShuttingDown per danm request.
 (part of 244106 that bsmedberg didn't get before landing on the trunk)

git-svn-id: svn://10.0.0.236/trunk@158201 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpfe/appshell/src/nsAppShellService.cpp | 6 +++---
 mozilla/xpfe/appshell/src/nsAppShellService.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mozilla/xpfe/appshell/src/nsAppShellService.cpp b/mozilla/xpfe/appshell/src/nsAppShellService.cpp
index 044edc607d4..415b6d448bb 100644
--- a/mozilla/xpfe/appshell/src/nsAppShellService.cpp
+++ b/mozilla/xpfe/appshell/src/nsAppShellService.cpp
@@ -109,7 +109,7 @@ static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID);
 static nsresult ConvertToUnicode(nsCString& aCharset, const char* inString, nsAString& outString); 
 
 nsAppShellService::nsAppShellService() : 
-  mDeleteCalled(PR_FALSE),
+  mXPCOMShuttingDown(PR_FALSE),
   mModalWindowCount(0),
   mConsiderQuitStopper(0),
   mShuttingDown(PR_FALSE),
@@ -983,7 +983,7 @@ nsAppShellService::RegisterTopLevelWindow(nsIXULWindow* aWindow)
 NS_IMETHODIMP
 nsAppShellService::UnregisterTopLevelWindow(nsIXULWindow* aWindow)
 {
-  if (mDeleteCalled) {
+  if (mXPCOMShuttingDown) {
     /* return an error code in order to:
        - avoid doing anything with other member variables while we are in
          the destructor
@@ -1434,7 +1434,7 @@ NS_IMETHODIMP nsAppShellService::Observe(nsISupports *aSubject,
     if (!openedWindow)
       OpenBrowserWindow(SIZE_TO_CONTENT, SIZE_TO_CONTENT);
   } else if (!strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
-    mDeleteCalled = PR_TRUE;
+    mXPCOMShuttingDown = PR_TRUE;
     nsCOMPtr<nsIWebShellWindow> hiddenWin(do_QueryInterface(mHiddenWindow));
     if(hiddenWin) {
       ClearXPConnectSafeContext();
diff --git a/mozilla/xpfe/appshell/src/nsAppShellService.h b/mozilla/xpfe/appshell/src/nsAppShellService.h
index ec75642826c..d40123e4bc2 100644
--- a/mozilla/xpfe/appshell/src/nsAppShellService.h
+++ b/mozilla/xpfe/appshell/src/nsAppShellService.h
@@ -81,7 +81,7 @@ protected:
   nsCOMPtr<nsIWindowMediator> mWindowMediator;
   nsCOMPtr<nsPIWindowWatcher> mWindowWatcher;
   nsCOMPtr<nsIXULWindow>      mHiddenWindow;
-  PRBool mDeleteCalled;
+  PRBool mXPCOMShuttingDown;
 #ifndef MOZ_XUL_APP
   nsCOMPtr<nsISplashScreen> mSplashScreen;
 #endif