Fixes torrent merge

Resolves brave#13268 Auditors: Test Plan:
NejcZdovc · Feb 23, 2018 · c050f3b · c050f3b
1 parent 12aa8bb
commit c050f3b
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/app/filtering.js b/app/filtering.js
@@ -776,13 +776,12 @@ module.exports.isResourceEnabled = (resourceName, url, isPrivate) => {
   if (resourceName === 'pdfjs') {
     return getSetting(settings.PDFJS_ENABLED, settingsState)
   }
-  if (resourceName === 'webtorrent') {
-    return getSetting(settings.TORRENT_VIEWER_ENABLED, settingsState)
-  }
 
   if (resourceName === 'webtorrent') {
     const extension = extensionState.getExtensionById(appState, config.torrentExtensionId)
-    return extension !== undefined ? extension.get('enabled') : false
+    const torrentEnabled = getSetting(settings.TORRENT_VIEWER_ENABLED, settingsState)
+    const extensionEnabled = extension !== undefined ? extension.get('enabled') : false
+    return extensionEnabled && torrentEnabled
   }
 
   if (resourceName === 'ledger') {