Skip to content

Commit a3de3e2

Browse files
committed
fix: Fixed restoring previous sesions from empty tabs, b=(no-bug), c=no-component
1 parent c32dc7e commit a3de3e2

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

src/browser/components/sessionstore/SessionStore-sys-mjs.patch

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
2-
index 8c6047e1ada5a22e57e1e665965237c9e22641d7..3290d6913d777185aa2edc5e302b65ff454c4ac8 100644
2+
index 8c6047e1ada5a22e57e1e665965237c9e22641d7..ccd2779d66eda9d034ca51cc3200d81447514e2c 100644
33
--- a/browser/components/sessionstore/SessionStore.sys.mjs
44
+++ b/browser/components/sessionstore/SessionStore.sys.mjs
55
@@ -2088,7 +2088,6 @@ var SessionStoreInternal = {
@@ -68,15 +68,28 @@ index 8c6047e1ada5a22e57e1e665965237c9e22641d7..3290d6913d777185aa2edc5e302b65ff
6868
continue;
6969
}
7070
let tabData = lazy.TabState.collect(tab, TAB_CUSTOM_VALUES.get(tab));
71-
@@ -5456,7 +5457,7 @@ var SessionStoreInternal = {
71+
@@ -5456,8 +5457,8 @@ var SessionStoreInternal = {
7272
// We don't store the Firefox View tab in Session Store, so if it was the last selected "tab" when
7373
// a window is closed, point to the first item in the tab strip instead (it will never be the Firefox View tab,
7474
// since it's only inserted into the tab strip after it's selected).
7575
- if (aWindow.FirefoxViewHandler.tab?.selected) {
76+
- selectedIndex = 1;
7677
+ if (aWindow.FirefoxViewHandler.tab?.selected || tabbrowser.selectedTab.hasAttribute("zen-empty-tab")) {
77-
selectedIndex = 1;
78+
+ selectedIndex = 0;
7879
winData.title = tabbrowser.tabs[0].label;
7980
}
81+
winData.selected = selectedIndex;
82+
@@ -5569,8 +5570,8 @@ var SessionStoreInternal = {
83+
// selectTab represents.
84+
let selectTab = 0;
85+
if (overwriteTabs) {
86+
- selectTab = parseInt(winData.selected || 1, 10);
87+
- selectTab = Math.max(selectTab, 1);
88+
+ selectTab = parseInt(winData.selected || 0, 10);
89+
+ selectTab = Math.max(selectTab, 0);
90+
selectTab = Math.min(selectTab, winData.tabs.length);
91+
}
92+
8093
@@ -5613,6 +5614,7 @@ var SessionStoreInternal = {
8194
winData.tabs,
8295
winData.groups ?? []

0 commit comments

Comments
 (0)