Merge pull request #12555 from brave/issue-12508

Check nullity of webcontents and empty url from getURL()
brave · Jan 8, 2018 · 726ac1c · 726ac1c
2 parents 9f70216 + 4316345
commit 726ac1c
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/app/filtering.js b/app/filtering.js
@@ -863,11 +863,15 @@ module.exports.getMainFrameUrl = (details) => {
   if (details.resourceType === 'mainFrame') {
     return details.url
   }
+  let url = null
   const tab = webContents.fromTabID(details.tabId)
-  try {
-    return tab.getURL()
-  } catch (ex) {}
-  return details.firstPartyUrl || null
+  if (tab && !tab.isDestroyed()) {
+    url = tab.getURL()
+  }
+  if (!url && details.firstPartyUrl) {
+    url = details.firstPartyUrl
+  }
+  return url
 }
 
 module.exports.alwaysAllowFullscreen = () => {