From 362a1ed9e4621c47b4dca99777015b90fc90451c Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 20 Oct 2019 10:58:22 -0400
Subject: Catch exception thrown on Edge

---
 ext/bg/js/api.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'ext/bg')

diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index 94a53e67..93d9c155 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -380,20 +380,24 @@ async function apiFocusTab(tab) {
         return;
     }
 
-    const tabWindow = await new Promise((resolve) => {
-        chrome.windows.get(tab.windowId, {}, (tabWindow) => {
-            const e = chrome.runtime.lastError;
-            if (e) { reject(e); }
-            else { resolve(tabWindow); }
-        });
-    });
-    if (!tabWindow.focused) {
-        await new Promise((resolve, reject) => {
-            chrome.windows.update(tab.windowId, {focused: true}, () => {
+    try {
+        const tabWindow = await new Promise((resolve) => {
+            chrome.windows.get(tab.windowId, {}, (tabWindow) => {
                 const e = chrome.runtime.lastError;
                 if (e) { reject(e); }
-                else { resolve(); }
+                else { resolve(tabWindow); }
             });
         });
+        if (!tabWindow.focused) {
+            await new Promise((resolve, reject) => {
+                chrome.windows.update(tab.windowId, {focused: true}, () => {
+                    const e = chrome.runtime.lastError;
+                    if (e) { reject(e); }
+                    else { resolve(); }
+                });
+            });
+        }
+    } catch (e) {
+        // Edge throws exception for no reason here.
     }
 }
-- 
cgit v1.2.3