diff options
author | Neil Richardson <nrich@ii.net> | 2015-09-25 14:52:54 +0800 |
---|---|---|
committer | Neil Richardson <nrich@ii.net> | 2015-09-25 14:52:54 +0800 |
commit | 93fb1dd251f4fdfb6b5c265074952f5d1ee52e97 (patch) | |
tree | 3fb26a3d3c5b51e17494384526b7b72c44d9557c | |
parent | e858c912243d3f8ce01d5b88d3a9d589886e74cc (diff) | |
download | uBlock-93fb1dd251f4fdfb6b5c265074952f5d1ee52e97.zip uBlock-93fb1dd251f4fdfb6b5c265074952f5d1ee52e97.tar.gz uBlock-93fb1dd251f4fdfb6b5c265074952f5d1ee52e97.tar.bz2 |
Do not call onReady if addon is installing
If the uBlock extension is installed globally for all users on a machine, a user's first run of Firefox will fail to load uBlock because the call to appShell.hiddenDOMWindow will throw an exception. A second run of Firefox will load uBlock successfully.
The change will skip the call to onReady if the reason for the call to startup is because the addon is being installed.
-rw-r--r-- | platform/firefox/bootstrap.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/firefox/bootstrap.js b/platform/firefox/bootstrap.js index d1adfc4..d8046b8 100644 --- a/platform/firefox/bootstrap.js +++ b/platform/firefox/bootstrap.js @@ -86,7 +86,7 @@ function startup(data, reason) { ); }; - if ( reason !== APP_STARTUP ) { + if ( reason !== APP_STARTUP && reason !== ADDON_INSTALL) { onReady(); return; } |