Bug 1228652 - Check for window.closed after flushing messages in navigateAndRestore. r?Mossop draft
authorMike Conley <mconley@mozilla.com>
Sun, 28 Feb 2016 20:36:47 -0500
changeset 335349 528bebc2883d5079ccf230bb2bfb0f81ee583f36
parent 334717 ad4d966f23677027aa0bd08f195f1478dd9d6d8c
child 515111 6d75656dee5292c144503fd4bf497e1c4c79572e
push id11764
push usermconley@mozilla.com
push dateMon, 29 Feb 2016 05:10:54 +0000
reviewersMossop
bugs1228652
milestone47.0a1
Bug 1228652 - Check for window.closed after flushing messages in navigateAndRestore. r?Mossop MozReview-Commit-ID: 9Cgxg9A61O7
browser/components/sessionstore/SessionStore.jsm
--- a/browser/components/sessionstore/SessionStore.jsm
+++ b/browser/components/sessionstore/SessionStore.jsm
@@ -2504,17 +2504,17 @@ var SessionStoreInternal = {
       // The tab might have been closed/gone in the meantime.
       if (tab.closing || !tab.linkedBrowser) {
         return;
       }
 
       let window = tab.ownerDocument && tab.ownerDocument.defaultView;
 
       // The tab or its window might be gone.
-      if (!window || !window.__SSi) {
+      if (!window || !window.__SSi || window.closed) {
         return;
       }
 
       let tabState = TabState.clone(tab);
       let options = {restoreImmediately: true};
 
       if (historyIndex >= 0) {
         tabState.index = historyIndex + 1;