From fd793b719593df19a11d523cc04dd31d08a95391 Mon Sep 17 00:00:00 2001
From: joey <joeyhuang921@outlook.com>
Date: Tue, 31 Mar 2020 23:00:41 -0400
Subject: [PATCH] record the newly open tab id if new window is craeted, which
 makes delete easier

---
 src/js/background/backgroundLogic.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js
index 93be0fc..67b8350 100644
--- a/src/js/background/backgroundLogic.js
+++ b/src/js/background/backgroundLogic.js
@@ -259,27 +259,29 @@ const backgroundLogic = {
   },
 
   async _sortTabsByWindowInternal(windowId, cookieStoreId) {
-    let createNew = false;
-    let tabs = await browser.tabs.query({
+    let newlyOpenedTabId = null;
+    const tabs = await browser.tabs.query({
       "cookieStoreId": cookieStoreId
     });
+
+    // create a new window so that move tabs to the new window
     if (windowId === -1) {
       const newWindowObj = await browser.windows.create();
       windowId = newWindowObj.id;
-      createNew = true;
+      newlyOpenedTabId = newWindowObj.tabs[0].id;
     }
+
+    // move all tabs
     browser.tabs.move(tabs.map((tab) => tab.id), {
       windowId: windowId,
       index: -1
     });
-    if (createNew) {
-      tabs = await browser.tabs.query({windowId: windowId});
-      for (const tab of tabs) {
-        if (tab.cookieStoreId !== cookieStoreId) {
-          browser.tabs.remove(tab.id);
-        }
-      }
+
+    // if new window is created, then close newly opened tab by its id
+    if (newlyOpenedTabId !== null) {
+      browser.tabs.remove(newlyOpenedTabId);
     }
+
   },
 
   async sortTabs() {