this fixes #399

gorhill · Jun 25, 2015 · 0afbb98 · 0afbb98
1 parent 1ba7894
commit 0afbb98
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js
@@ -908,6 +908,12 @@ var tabWatcher = (function() {
 
     var currentBrowser = function() {
         var win = Services.wm.getMostRecentWindow('navigator:browser');
+        // https://github.com/gorhill/uBlock/issues/399
+        // getTabBrowser() can return null at browser launch time.
+        var tabBrowser = getTabBrowser(win);
+        if ( tabBrowser === null ) {
+            return null;
+        }
         return browserFromTarget(getTabBrowser(win).selectedTab);
     };