Destroy all tabs when a window is closed (fix #1871)

beakerbrowser · Dec 8, 2020 · 83247b5 · 83247b5
1 parent a48373d
commit 83247b5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/app/bg/ui/tabs/manager.js b/app/bg/ui/tabs/manager.js
@@ -884,6 +884,13 @@ export async function remove (win, tab) {
   emitReplaceState(win)
 }
 
+export async function destroyAll (win) {
+  for (let t of (activeTabs[win.id] || [])) {
+    t.destroy()
+  }
+  delete activeTabs[win.id]
+}
+
 export async function removeAllExcept (win, tab) {
   win = getTopWindow(win)
   var tabs = getAll(win).slice() // .slice() to duplicate the list

diff --git a/app/bg/ui/windows.js b/app/bg/ui/windows.js
@@ -240,6 +240,7 @@ export function createShellWindow (windowState, createOpts = {dontInitPages: fal
     for (let k in subwindows) {
       subwindows[k].destroy(win)
     }
+    tabManager.destroyAll(win)
   })
 
   async function handlePagesReady ({ sender }) {