Bug 402348 - "popup statusbar notification switches to incorrect tab when tab closed" [p=wgianopoulos@yahoo.com (Bill Gianopoulos) r=gavin a=blocking-firefox3+]

browser/base/content/tabbrowser.xml

@@ -708,7 +708,8 @@
             }
 
             var updatePageReport = false;
-            if ((this.mCurrentBrowser.pageReport && !newBrowser.pageReport) ||
+            if (!this.mCurrentBrowser ||
+                (this.mCurrentBrowser.pageReport && !newBrowser.pageReport) ||
                 (!this.mCurrentBrowser.pageReport && newBrowser.pageReport))
               updatePageReport = true;
 
@@ -1432,6 +1433,9 @@
             // reset by updateCurrentBrowser.
             oldBrowser.destroy();
 
+            if (oldBrowser == this.mCurrentBrowser)
+              this.mCurrentBrowser = null;
+
             // Remove the tab
             this.mTabContainer.removeChild(oldTab);
             // invalidate cache, because mTabContainer is about to change