|
1 | 1 | 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 |
3 | 3 | --- a/browser/components/sessionstore/SessionStore.sys.mjs
|
4 | 4 | +++ b/browser/components/sessionstore/SessionStore.sys.mjs
|
5 | 5 | @@ -2088,7 +2088,6 @@ var SessionStoreInternal = {
|
@@ -68,15 +68,28 @@ index 8c6047e1ada5a22e57e1e665965237c9e22641d7..3290d6913d777185aa2edc5e302b65ff
|
68 | 68 | continue;
|
69 | 69 | }
|
70 | 70 | 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 = { |
72 | 72 | // We don't store the Firefox View tab in Session Store, so if it was the last selected "tab" when
|
73 | 73 | // a window is closed, point to the first item in the tab strip instead (it will never be the Firefox View tab,
|
74 | 74 | // since it's only inserted into the tab strip after it's selected).
|
75 | 75 | - if (aWindow.FirefoxViewHandler.tab?.selected) {
|
| 76 | +- selectedIndex = 1; |
76 | 77 | + if (aWindow.FirefoxViewHandler.tab?.selected || tabbrowser.selectedTab.hasAttribute("zen-empty-tab")) {
|
77 |
| - selectedIndex = 1; |
| 78 | ++ selectedIndex = 0; |
78 | 79 | winData.title = tabbrowser.tabs[0].label;
|
79 | 80 | }
|
| 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 | + |
80 | 93 | @@ -5613,6 +5614,7 @@ var SessionStoreInternal = {
|
81 | 94 | winData.tabs,
|
82 | 95 | winData.groups ?? []
|
|
0 commit comments