| Index: lib/ui.js |
| =================================================================== |
| --- a/lib/ui.js |
| +++ b/lib/ui.js |
| @@ -304,17 +304,17 @@ let UI = exports.UI = |
| { |
| reject(new Error("Unexpected: Failed to load overlay.xul")); |
| }); |
| request.send(null); |
| })); |
| // Wait for filters to load |
| - if (FilterStorage._loading) |
| + if (!FilterStorage.initialized) |
| prerequisites.push(FilterNotifier.once("load")); |
| // Wait for session to be restored |
| prerequisites.push(new Promise((resolve, reject) => |
| { |
| let window = this.currentWindow; |
| if (!window && "nsISessionStore" in Ci) |
| { |
| @@ -492,17 +492,17 @@ let UI = exports.UI = |
| }.bind(this), |
| }); |
| onShutdown.add(CustomizableUI.destroyWidget.bind(CustomizableUI, "abp-toolbarbutton")); |
| } |
| }, |
| firstRunActions: function(window) |
| { |
| - if (this.firstRunDone || !window || FilterStorage._loading) |
| + if (this.firstRunDone || !window || !FilterStorage.initialized) |
| return; |
| this.firstRunDone = true; |
| let {addonVersion} = require("info"); |
| let prevVersion = Prefs.currentVersion; |
| if (prevVersion != addonVersion) |
| { |