|
|
@@ -0,0 +1,34 @@
|
|
|
+# HG changeset patch
|
|
|
+# User Nuno Silva <nunojsg@gmail.com>
|
|
|
+# Date 1710615322 -3600
|
|
|
+# Parent 633fb46707fd3683e5512378c887c9b44bfbba50
|
|
|
+Bug 1885748 - Catch webNavigation error during tab restore. r=frg a=frg
|
|
|
+
|
|
|
+diff --git a/suite/browser/tabbrowser.xml b/suite/browser/tabbrowser.xml
|
|
|
+--- a/suite/browser/tabbrowser.xml
|
|
|
++++ b/suite/browser/tabbrowser.xml
|
|
|
+@@ -1944,17 +1944,23 @@
|
|
|
+ var hist = savedData.browserData.history;
|
|
|
+
|
|
|
+ this.tabContainer.appendChild(t);
|
|
|
+ if (t.previousSibling.selected)
|
|
|
+ t.setAttribute("afterselected", true);
|
|
|
+
|
|
|
+ // navigate back to the proper page from the light page
|
|
|
+ b.stop();
|
|
|
+- b.webNavigation.gotoIndex(0);
|
|
|
++ try {
|
|
|
++ b.webNavigation.gotoIndex(0);
|
|
|
++ } catch (e) {
|
|
|
++ // Might happen if the to be restored tag contains an invalid
|
|
|
++ // navigation scheme.
|
|
|
++ Cu.reportError(e);
|
|
|
++ }
|
|
|
+
|
|
|
+ // reattach the old history
|
|
|
+ b.webNavigation.sessionHistory = hist;
|
|
|
+
|
|
|
+ // add back the filters, security first (bug 313335)
|
|
|
+ var secFlags = Ci.nsIWebProgress.NOTIFY_STATE_ALL |
|
|
|
+ Ci.nsIWebProgress.NOTIFY_LOCATION |
|
|
|
+ Ci.nsIWebProgress.NOTIFY_SECURITY;
|
Frank-Rainer Grahl