fix _canEnable being used before setting options

FooSoft · Apr 14, 2020 · b6f7f8c · b6f7f8c
1 parent 950f50e
commit b6f7f8c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
@@ -147,7 +147,8 @@ class Frontend extends TextScanner {
     }
 
     async updateOptions() {
-        this.setOptions(await apiOptionsGet(this.getOptionsContext()), this._canEnable());
+        this.options = await apiOptionsGet(this.getOptionsContext());
+        this.setOptions(this.options, this._canEnable());
 
         const ignoreNodes = ['.scan-disable', '.scan-disable *'];
         if (!this.options.scanning.enableOnPopupExpressions) {
@@ -287,7 +288,6 @@ class Frontend extends TextScanner {
     }
 
     _canEnable() {
-        if (this.options === null) { return true; } // called by updateOptions for the first time
         return this.popup.depth <= this.options.scanning.popupNestingMaxDepth && !this._disabledOverride;
     }