Copy selected tabs correctly

piroor · Nov 9, 2023 · 8293dab · 8293dab
1 parent eb23855
commit 8293dab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/background/context-menu.js b/background/context-menu.js
@@ -348,6 +348,11 @@ async function onShown(info, tab) {
   await context.resolve();
 
   const chooseFromMenu = (context.isTreeParent ? configs.modeForNoSelectionTree : configs.modeForNoSelection) == Constants.kCOPY_CHOOSE_FROM_MENU;
+  log('onShown ', {
+    chooseFromMenu,
+    isTreeParent: context.isTreeParent,
+    multiselected: context.multiselectedTabs.length > 1,
+  });
   const titleKey = (context.multiselectedTabs.length > 1 || chooseFromMenu) ?
     'context_copyTabs_label' :
     context.shouldCopyAll ? 'context_copyAllTabs_label' :

diff --git a/common/Context.js b/common/Context.js
@@ -52,15 +52,13 @@ export class Context {
   async resolveMultiselectedTabs() {
     if (this.multiselectedTabs)
       return;
-    this.multiselectedTabs = !this.multiselectedTabs && (
-      this.tab.highlighted ?
-        browser.tabs.query({
-          windowId:    this.tab.windowId,
-          highlighted: true,
-          hidden:      false,
-        }) :
-        [this.tab]
-    );
+    this.multiselectedTabs = this.tab.highlighted ?
+      (await browser.tabs.query({
+        windowId:    this.tab.windowId,
+        highlighted: true,
+        hidden:      false,
+      })) :
+      [this.tab];
   }
 
   async resolveDescendantTabs() {