From 96c784704a0db2504ea580b03f919dbcee29c793 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Wed, 16 Apr 2025 01:39:02 +0200
Subject: [PATCH] fix: closes #7547 - Fixed removing workspaces still leaving
 remains, r=tabs, workspaces

---
 src/browser/components/tabbrowser/content/tabs-js.patch | 4 ++--
 src/zen/workspaces/ZenWorkspaces.mjs                    | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index b2f88a09c..542406423 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..18c8f0fc9f75a3a69c2696d7bd69faff0fd01488 100644
+index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..75a30478387494c06e5c8131f55ba5dc977c8415 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -93,7 +93,7 @@
@@ -115,7 +115,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..18c8f0fc9f75a3a69c2696d7bd69faff
 +          return;
 +        }
 +      } else if (dt.mozUserCancelled) {
-+        gZenViewSplitter._lastOpenedTab?._visuallySelected = false;
++        if (gZenViewSplitter._lastOpenedTab) gZenViewSplitter._lastOpenedTab._visuallySelected = false;
 +      }
 +
 +      this._finishMoveTogetherSelectedTabs(draggedTab);
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index ec4f24ecf..2619f129a 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -877,6 +877,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     await this._propagateWorkspaceData();
     await this._updateWorkspacesChangeContextMenu();
     this.onWindowResize();
+    for (let container of document.querySelectorAll(`.zen-workspace-tabs-section[zen-workspace-id="${windowID}"]`)) {
+      container.remove();
+    }
   }
 
   isWorkspaceActive(workspace) {
@@ -1399,7 +1402,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
   _deleteAllTabsInWorkspace(workspaceID) {
     gBrowser.removeTabs(
-      Array.from(gBrowser.tabs).filter(
+      Array.from(this.allStoredTabs).filter(
         (tab) => tab.getAttribute('zen-workspace-id') === workspaceID && !tab.hasAttribute('zen-empty-tab')
       ),
       {