Skip to content

Commit 8c13d2b

Browse files
committed
Workaround for current tab on current window not always available to UI popup on Vivaldi.
1 parent e0fc2a0 commit 8c13d2b

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/ui/popup.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,14 @@ addEventListener("unload", e => {
5050
let optionsClosed = false;
5151

5252
let tabFlags = {active: true};
53-
if (browser.windows) tabFlags.currentWindow = true; // Desktop browsers only
53+
if (browser.windows) {
54+
// Desktop browsers only
55+
56+
// The currentWindow filter seems broken on Vivaldi, sometimes returns no tab...
57+
// tabFlags.currentWindow = true;
58+
// ... so we take the long route to be safe
59+
tabFlags.windowId = (await browser.windows.getCurrent())?.id;
60+
}
5461
let tab = (await browser.tabs.query(tabFlags))[0] ||
5562
// work-around for Firefox "forgetting" tabs on Android
5663
(await browser.tabs.query({url: ["*://*/*", "file:///*", "ftp://*/*"]}))[0];

0 commit comments

Comments
 (0)