From 93fb1dd251f4fdfb6b5c265074952f5d1ee52e97 Mon Sep 17 00:00:00 2001 From: Neil Richardson Date: Fri, 25 Sep 2015 14:52:54 +0800 Subject: [PATCH] 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. --- platform/firefox/bootstrap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/firefox/bootstrap.js b/platform/firefox/bootstrap.js index d1adfc47b..d8046b8a9 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; }