Firefox: check for non-existent button

This commit is contained in:
Deathamns 2015-03-18 07:04:30 +01:00
parent c9f6a31701
commit 6c0bde394d
1 changed files with 4 additions and 1 deletions

View File

@ -1019,7 +1019,7 @@ var httpObserver = {
// Guard against stale instances not having been unregistered // Guard against stale instances not having been unregistered
if ( this.componentRegistrar.isCIDRegistered(this.classID) ) { if ( this.componentRegistrar.isCIDRegistered(this.classID) ) {
try { try {
this.componentRegistrar.unregisterFactory(this.classID, Components.manager.getClassObject(this.classID, Ci.nsIFactory)) this.componentRegistrar.unregisterFactory(this.classID, Components.manager.getClassObject(this.classID, Ci.nsIFactory));
} catch (ex) { } catch (ex) {
console.error('µBlock> httpObserver > unable to unregister stale instance: ', ex); console.error('µBlock> httpObserver > unable to unregister stale instance: ', ex);
} }
@ -1839,6 +1839,9 @@ var optionsObserver = {
setupOptionsButton: function(doc, id, page) { setupOptionsButton: function(doc, id, page) {
var button = doc.getElementById(id); var button = doc.getElementById(id);
if ( button === null ) {
return;
}
button.addEventListener('command', function() { button.addEventListener('command', function() {
vAPI.tabs.open({ url: page, index: -1 }); vAPI.tabs.open({ url: page, index: -1 });
}); });