Fix issue that would cause loading tabs not to close

beakerbrowser · Mar 17, 2019 · 69f7d5a · 69f7d5a
1 parent d433154
commit 69f7d5a
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/app/background-process/ui/view-manager.js b/app/background-process/ui/view-manager.js
@@ -1148,11 +1148,18 @@ function addToNoRedirects (url) {
 }
 
 async function fireBeforeUnloadEvent (wc) {
-  return wc.executeJavaScript(`
-    (function () {
-      let unloadEvent = new Event('beforeunload', {bubbles: false, cancelable: true})
-      unloadEvent.returnValue = false
-      return window.dispatchEvent(unloadEvent)
-    })()
-  `)
+  try {
+    if (wc.isWaitingForResponse()) {
+      return // dont bother
+    }
+    return await wc.executeJavaScript(`
+      (function () {
+        let unloadEvent = new Event('beforeunload', {bubbles: false, cancelable: true})
+        unloadEvent.returnValue = false
+        return window.dispatchEvent(unloadEvent)
+      })()
+    `)
+    } catch (e) {
+      // ignore
+    }
 }