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

Merge branch 'temp'

This commit is contained in:
gorhill 2015-11-20 00:16:16 -05:00
parent 4e9d41a150 c4e3e1e8e5
commit 5a63dc3184
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3278,7 +3278,19 @@ var optionsObserver = {
cleanupTasks.push(this.unregister.bind(this));
var browser = tabWatcher.currentBrowser();
if ( browser && browser.currentURI && browser.currentURI.spec === 'about:addons' ) {
if ( !browser ) {
return;
}
// https://github.com/gorhill/uBlock/issues/948
// Older versions of Firefox can throw here when looking up `currentURI`.
var currentURI;
try {
currentURI = browser.currentURI;
} catch (ex) {
}
if ( currentURI && currentURI.spec === 'about:addons' ) {
this.observe(browser.contentDocument, 'addon-enabled', this.addonId);
}
},