From 8422d5c111d0a82ad94dc3eeba0c739021eda518 Mon Sep 17 00:00:00 2001
From: mbnuqw <maxbadryzlov@gmail.com>
Date: Mon, 27 Jan 2025 20:54:43 +0500
Subject: [PATCH] fix: windows: lock tabs init on early steps of createWithTabs

This should prevent some cases of losing tabs structure on opening
window by sidebery e.g. opening snapshot window or moving tabs to new
window. (#1910)
---
 src/services/windows.actions.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/services/windows.actions.ts b/src/services/windows.actions.ts
index 09973054..4c265916 100644
--- a/src/services/windows.actions.ts
+++ b/src/services/windows.actions.ts
@@ -122,20 +122,24 @@ export function closeWindowsPopup(): void {
 
 const lockedWindowsTabs: Record<ID, boolean | { move: boolean; cache: TabCache[] }> = {}
 export function isWindowTabsLocked(id: ID): boolean | { move: boolean; cache: TabCache[] } {
-  Logs.info('Windows.isWindowTabsLocked', id, typeof lockedWindowsTabs[id])
   const locked = lockedWindowsTabs[id]
+  Logs.info('Windows.isWindowTabsLocked', id, typeof locked, globalTabsLockCounter)
   if (locked && locked !== true) {
     delete lockedWindowsTabs[id]
   }
-  return locked ?? false
+  return locked ?? globalTabsLockCounter > 0
 }
 
+let globalTabsLockCounter = 0
+
 export async function createWithTabs(
   tabsInfo: ItemInfo[],
   conf?: browser.windows.CreateData
 ): Promise<boolean> {
   Logs.info('Windows.createWithTabs', tabsInfo.length)
 
+  globalTabsLockCounter++
+
   if (!conf) conf = {}
 
   const moveTabs = conf.tabId === MOVEID
@@ -172,8 +176,10 @@ export async function createWithTabs(
       }
     }
     Logs.err('Windows: Cannot create window with tabs', err)
+    globalTabsLockCounter--
     return false
   }
+  globalTabsLockCounter--
   if (!window.id || !window.tabs?.length) return true
   lockedWindowsTabs[window.id] = true