1 files changed, 6 insertions, 22 deletions

diff --git a/ext/js/yomichan.js b/ext/js/yomichan.js
index 6eea952e..a4feaa23 100644
--- a/ext/js/yomichan.js
+++ b/ext/js/yomichan.js
@@ -129,12 +129,12 @@ class Yomichan extends EventDispatcher {
         if (!isBackground) {
             this._api = new API(this);
 
-            this._crossFrame = new CrossFrameAPI();
-            this._crossFrame.prepare();
-
             this.sendMessage({action: 'requestBackendReadySignal'});
             await this._isBackendReadyPromise;
 
+            this._crossFrame = new CrossFrameAPI();
+            await this._crossFrame.prepare();
+
             log.on('log', this._onForwardLog.bind(this));
         }
     }
@@ -172,24 +172,6 @@ class Yomichan extends EventDispatcher {
         }
     }
 
-    /**
-     * Runs `chrome.runtime.connect()` with additional exception handling events.
-     * @param {...*} args The arguments to be passed to `chrome.runtime.connect()`.
-     * @returns {Port} The resulting port.
-     * @throws {Error} Errors thrown by `chrome.runtime.connect()` are re-thrown.
-     */
-    connect(...args) {
-        try {
-            return chrome.runtime.connect(...args);
-        } catch (e) {
-            this.triggerExtensionUnloaded();
-            throw e;
-        }
-    }
-
-    /**
-     * Runs chrome.runtime.connect() with additional exception handling events.
-     */
     triggerExtensionUnloaded() {
         this._isExtensionUnloaded = true;
         if (this._isTriggeringExtensionUnloaded) { return; }
@@ -232,7 +214,9 @@ class Yomichan extends EventDispatcher {
     }
 
     _onMessageOptionsUpdated({source}) {
-        this.trigger('optionsUpdated', {source});
+        if (source !== 'background') {
+            this.trigger('optionsUpdated', {source});
+        }
     }
 
     _onMessageDatabaseUpdated({type, cause}) {