mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2026-09-14 08:51:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

gh-14938: Fix CWLO for only pinned/essential tabs (gh-15324)

Browse Source
This commit is contained in:
Brandon Quon
2026-09-10 01:27:53 -07:00
committed by GitHub
parent 2e9aecd41b
commit ed6900d762
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/browser/components/sessionstore/SessionStore-sys-mjs.patch
View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
index 76a984f6e21409941ea038218d161e67f2e0c23d..845080748b018130506848104c83632d57fdffe6 100644
index 76a984f6e21409941ea038218d161e67f2e0c23d..52408568a33a89c0e3d0d1514152ded2eaa1afed 100644
--- a/browser/components/sessionstore/SessionStore.sys.mjs
+++ b/browser/components/sessionstore/SessionStore.sys.mjs
@@ -126,6 +126,11 @@ const TAB_EVENTS = [
@@ -334,7 +334,14 @@ index 76a984f6e21409941ea038218d161e67f2e0c23d..845080748b018130506848104c83632d
let promiseParts = Promise.withResolvers();
aWindow.setTimeout(() => {
@@ -7654,7 +7717,7 @@ var SessionStoreInternal = {
@@ -7356,5 +7419,6 @@ var SessionStoreInternal = {
*/
_isCmdLineEmpty: function ssi_isCmdLineEmpty(aWindow, aState) {
var pinnedOnly =
+ !Services.prefs.getBoolPref("zen.workspaces.continue-where-left-off") &&
aState.windows &&
aState.windows.every(win => win.tabs.every(tab => tab.pinned));
@@ -7654,7 +7718,7 @@ var SessionStoreInternal = {
let groupsToSave = new Map();
for (let tIndex = 0; tIndex < window.tabs.length; ) {
@@ -343,7 +350,7 @@ index 76a984f6e21409941ea038218d161e67f2e0c23d..845080748b018130506848104c83632d
// Adjust window.selected
if (tIndex + 1 < window.selected) {
window.selected -= 1;
@@ -7669,7 +7732,7 @@ var SessionStoreInternal = {
@@ -7669,7 +7733,7 @@ var SessionStoreInternal = {
);
// We don't want to increment tIndex here.
continue;
@@ -352,7 +359,7 @@ index 76a984f6e21409941ea038218d161e67f2e0c23d..845080748b018130506848104c83632d
// Convert any open groups into saved groups.
let groupStateToSave = window.groups.find(
groupState => groupState.id == window.tabs[tIndex].groupId
@@ -8233,7 +8296,6 @@ var SessionStoreInternal = {
@@ -8233,7 +8297,6 @@ var SessionStoreInternal = {
timer.initWithCallback(
function () {
if (beats <= 0) {
@@ -360,7 +367,7 @@ index 76a984f6e21409941ea038218d161e67f2e0c23d..845080748b018130506848104c83632d
Glean.sessionRestore.shutdownFlushAllOutcomes.timed_out.add(1);
deferred.resolve();
}
@@ -8711,6 +8773,7 @@ var SessionStoreInternal = {
@@ -8711,6 +8774,7 @@ var SessionStoreInternal = {
if (
!savedTabGroupState.tabs.length ||
this.getSavedTabGroup(savedTabGroupState.id)