[XPFE] Properly anchor XUL windows when tearing down

1 files changed, 2 insertions, 10 deletions

diff --git a/xpfe/appshell/nsXULWindow.cpp b/xpfe/appshell/nsXULWindow.cpp
index 8f2d9fde5f..5850850651 100644
--- a/xpfe/appshell/nsXULWindow.cpp
+++ b/xpfe/appshell/nsXULWindow.cpp
@@ -455,6 +455,8 @@ NS_IMETHODIMP nsXULWindow::Destroy()
   if (mDestroying)
     return NS_OK;
 
+  nsCOMPtr<nsIXULWindow> kungFuDeathGrip(this);
+  
   mozilla::AutoRestore<bool> guard(mDestroying);
   mDestroying = true;
 
@@ -467,16 +469,6 @@ NS_IMETHODIMP nsXULWindow::Destroy()
   if (parentWindow)
     parentWindow->RemoveChildWindow(this);
 
-  // let's make sure the window doesn't get deleted out from under us
-  // while we are trying to close....this can happen if the docshell
-  // we close ends up being the last owning reference to this xulwindow
-
-  // XXXTAB This shouldn't be an issue anymore because the ownership model
-  // only goes in one direction.  When webshell container is fully removed
-  // try removing this...
-
-  nsCOMPtr<nsIXULWindow> placeHolder = this;
-
   // Remove modality (if any) and hide while destroying. More than
   // a convenience, the hide prevents user interaction with the partially
   // destroyed window. This is especially necessary when the eldest window