From 5dea28a3cb089a22f8353fcd1024d654fc3d5d3a Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Sun, 25 Jan 2026 12:12:56 +0100
Subject: [PATCH] feat: Fixed windows not initializing when window sync is
 disabled, b=closes #11999, p=#12015

---
 src/zen/sessionstore/ZenSessionManager.sys.mjs | 4 ++--
 src/zen/sessionstore/ZenWindowSync.sys.mjs     | 5 ++++-
 surfer.json                                    | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/zen/sessionstore/ZenSessionManager.sys.mjs b/src/zen/sessionstore/ZenSessionManager.sys.mjs
index 154f35a02..350bbfc43 100644
--- a/src/zen/sessionstore/ZenSessionManager.sys.mjs
+++ b/src/zen/sessionstore/ZenSessionManager.sys.mjs
@@ -345,7 +345,7 @@ export class nsZenSessionManager {
   saveState(state) {
     let windows = state?.windows || [];
     windows = windows.filter((win) => this.#isWindowSaveable(win));
-    if (!windows.length || !lazy.gWindowSyncEnabled) {
+    if (!windows.length) {
       // Don't save (or even collect) anything in permanent private
       // browsing mode. We also don't want to save if there are no windows.
       return;
@@ -525,7 +525,7 @@ export class nsZenSessionManager {
    *        Whether this new window is being restored from a closed window.
    */
   restoreNewWindow(aWindow, SessionStoreInternal, fromClosedWindow = false) {
-    if (aWindow.gZenWorkspaces?.privateWindowOrDisabled || !lazy.gWindowSyncEnabled) {
+    if (aWindow.gZenWorkspaces?.privateWindowOrDisabled) {
       return;
     }
     this.log("Restoring new window with Zen session data");
diff --git a/src/zen/sessionstore/ZenWindowSync.sys.mjs b/src/zen/sessionstore/ZenWindowSync.sys.mjs
index 9764c9ed3..59e27f9eb 100644
--- a/src/zen/sessionstore/ZenWindowSync.sys.mjs
+++ b/src/zen/sessionstore/ZenWindowSync.sys.mjs
@@ -140,7 +140,7 @@ class nsZenWindowSync {
   }
 
   init() {
-    if (!lazy.gWindowSyncEnabled || this.#initialized) {
+    if (this.#initialized) {
       return;
     }
     this.#initialized = true;
@@ -309,6 +309,9 @@ class nsZenWindowSync {
     ) {
       return;
     }
+    if (!lazy.gWindowSyncEnabled && !UNSYNCED_WINDOW_EVENTS.includes(aEvent.type)) {
+      return;
+    }
     if (INSTANT_EVENTS.includes(aEvent.type)) {
       this.#handleNextEvent(aEvent);
       return;
diff --git a/surfer.json b/surfer.json
index 99ea0cc8d..0ea090636 100644
--- a/surfer.json
+++ b/surfer.json
@@ -20,7 +20,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.18.1b",
+        "displayVersion": "1.18.2b",
         "github": {
           "repo": "zen-browser/desktop"
         },