mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2026-01-28 23:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fixed 'Restore previous session' not working winth wsync disabled, b=closes #12034, c=common

Browse Source
This commit is contained in:
mr. m
2026-01-26 09:43:31 +01:00
parent 3a51b36a05
commit ccc1e998da
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/zen/common/modules/ZenMenubar.mjs
View File

@@ -124,6 +124,9 @@ export class nsZenMenuBar {
}
#hideWindowRestoreMenus() {
if (!Services.prefs.getBoolPref("zen.window-sync.enabled", true)) {
return;
}
const itemsToHide = ["appMenuRecentlyClosedWindows", "historyUndoWindowMenu"];
for (const id of itemsToHide) {
const element = PanelMultiView.getViewNode(document, id);

19
src/zen/sessionstore/ZenSessionManager.sys.mjs
View File

@@ -191,6 +191,13 @@ export class nsZenSessionManager {
}
}
get #shouldRestoreOnlyPinned() {
return (
Services.prefs.getIntPref("browser.startup.page", 1) !== BROWSER_STARTUP_RESUME_SESSION ||
lazy.PrivateBrowsingUtils.permanentPrivateBrowsing
);
}
/**
* Called when the session file is read. Restores the sidebar data
* into all windows.
@@ -200,6 +207,13 @@ export class nsZenSessionManager {
*/
onFileRead(initialState) {
if (!lazy.gWindowSyncEnabled) {
if (initialState?.windows?.length && this.#shouldRestoreOnlyPinned) {
this.log("Window sync disabled, restoring only pinned tabs");
for (let i = 0; i < initialState.windows.length; i++) {
let winData = initialState.windows[i];
winData.tabs = (winData.tabs || []).filter((tab) => tab.pinned);
}
}
return initialState;
}
// For the first time after migration, we restore the tabs
@@ -225,10 +239,7 @@ export class nsZenSessionManager {
}
// When we don't have browser.startup.page set to resume session,
// we only want to restore the pinned tabs into the new windows.
const shouldRestoreOnlyPinned =
Services.prefs.getIntPref("browser.startup.page", 1) !== BROWSER_STARTUP_RESUME_SESSION ||
lazy.PrivateBrowsingUtils.permanentPrivateBrowsing;
if (shouldRestoreOnlyPinned && this.#sidebar?.tabs) {
if (this.#shouldRestoreOnlyPinned && this.#sidebar?.tabs) {
this.log("Restoring only pinned tabs into windows");
const sidebar = this.#sidebar;
sidebar.tabs = (sidebar.tabs || []).filter((tab) => tab.pinned);