Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#1004: this addresses `win` potentially being `null` at shutdown time (Pale Moon)

This commit is contained in:
gorhill 2015-12-04 11:35:31 -05:00
parent 2bf50af04f
commit 665ac59c73
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
platform/firefox/vapi-background.js
View File

@ -706,7 +706,7 @@ var getTabBrowser = (function() {
} }
return function(win) { return function(win) {
return win.gBrowser || null; return win && win.gBrowser || null;
}; };
})(); })();
@ -966,6 +966,9 @@ vAPI.tabs._remove = (function() {
}; };
} }
return function(tab, tabBrowser, nuke) { return function(tab, tabBrowser, nuke) {
if ( !tabBrowser ) {
return;
}
if ( tabBrowser.tabs.length === 1 && nuke ) { if ( tabBrowser.tabs.length === 1 && nuke ) {
getOwnerWindow(tab).close(); getOwnerWindow(tab).close();
} else { } else {
@ -1016,11 +1019,14 @@ vAPI.tabs.select = function(tab) {
return; return;
} }
// https://github.com/gorhill/uBlock/issues/470
var win = getOwnerWindow(tab); var win = getOwnerWindow(tab);
win.focus();
var tabBrowser = getTabBrowser(win); var tabBrowser = getTabBrowser(win);
if ( tabBrowser === null ) {
return;
}
// https://github.com/gorhill/uBlock/issues/470
win.focus();
if ( vAPI.fennec ) { if ( vAPI.fennec ) {
tabBrowser.selectTab(tab); tabBrowser.selectTab(tab);
@ -1077,7 +1083,7 @@ var tabWatcher = (function() {
return -1; return -1;
} }
var tabbrowser = getTabBrowser(win); var tabbrowser = getTabBrowser(win);
if ( !tabbrowser ) { if ( tabbrowser === null ) {
return -1; return -1;
} }
// This can happen, for example, the `view-source:` window, there is // This can happen, for example, the `view-source:` window, there is
@ -1108,7 +1114,7 @@ var tabWatcher = (function() {
return null; return null;
} }
var tabbrowser = getTabBrowser(win); var tabbrowser = getTabBrowser(win);
if ( !tabbrowser ) { if ( tabbrowser === null ) {
return null; return null;
} }
if ( !tabbrowser.tabs || i >= tabbrowser.tabs.length ) { if ( !tabbrowser.tabs || i >= tabbrowser.tabs.length ) {
@ -1289,7 +1295,7 @@ var tabWatcher = (function() {
vAPI.contextMenu.unregister(win); vAPI.contextMenu.unregister(win);
var tabBrowser = getTabBrowser(win); var tabBrowser = getTabBrowser(win);
if ( !tabBrowser ) { if ( tabBrowser === null ) {
return; return;
} }