From d62d353958c213c5c073973a062fbb2e3770f024 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Fri, 13 Nov 2020 19:51:51 -0500
Subject: [PATCH] Fix options not being propagated fully after being updated
 (#1025)

---
 ext/fg/js/popup.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index df177289..826457c1 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -105,9 +105,8 @@ class Popup extends EventDispatcher {
     }
 
     async setOptionsContext(optionsContext) {
-        this._optionsContext = optionsContext;
-        this._options = await api.optionsGet(optionsContext);
-        this.updateTheme();
+        await this._setOptionsContext(optionsContext);
+        await this._invokeSafe('setOptionsContext', {optionsContext});
     }
 
     hide(changeFocus) {
@@ -655,8 +654,14 @@ class Popup extends EventDispatcher {
         };
     }
 
+    async _setOptionsContext(optionsContext) {
+        this._optionsContext = optionsContext;
+        this._options = await api.optionsGet(optionsContext);
+        this.updateTheme();
+    }
+
     async _setOptionsContextIfDifferent(optionsContext) {
         if (deepEqual(this._optionsContext, optionsContext)) { return; }
-        await this.setOptionsContext(optionsContext);
+        await this._setOptionsContext(optionsContext);
     }
 }