HTTP server: fixes that were causing page hangs

2 files changed, 8 insertions, 2 deletions

diff --git a/webext/src/background/tab.js b/webext/src/background/tab.js
index d67a0eb..7f0dc78 100644
--- a/webext/src/background/tab.js
+++ b/webext/src/background/tab.js
@@ -116,7 +116,13 @@ export default class extends utils.mixins(CommonMixin, TabCommandsMixin) {
   sendGlobalConfig(config) {
     config.http_server_mode_type = this._calculateMode();
     config.start_time = this.start_time;
-    this.channel.postMessage(`/config,${JSON.stringify(config)}`);
+    if (this.channel) {
+      this.channel.postMessage(`/config,${JSON.stringify(config)}`);
+    } else {
+      setTimeout(() => {
+        this.sendGlobalConfig(config);
+      }, 1);
+    }
   }
 
   _listenForMessages() {
diff --git a/webext/src/dom/manager.js b/webext/src/dom/manager.js
index 82c0676..76d5afe 100644
--- a/webext/src/dom/manager.js
+++ b/webext/src/dom/manager.js
@@ -25,6 +25,7 @@ export default class extends utils.mixins(CommonMixin, CommandsMixin) {
   }
 
   _postSetupConstructor() {
+    this._injectCustomCSS();
     this.dimensions.channel = this.channel;
     this.graphics_builder = new GraphicsBuilder(
       this.channel,
@@ -191,7 +192,6 @@ export default class extends utils.mixins(CommonMixin, CommandsMixin) {
       this.is_dom_loaded = true;
       this.log("DOM LOADED");
       this._fixStickyElements();
-      this._injectCustomCSS();
       this._willHideText();
     });
     window.addEventListener("load", () => {