From 8a3613ac6f4aa9b8686a4a08abce6f351ffeed04 Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Thu, 19 Nov 2020 16:11:58 +0200
Subject: [PATCH] fix extensionLoader error on dev environments where renderer
 might start early (#1447)

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 src/extensions/extension-loader.ts | 9 +++++----
 src/main/index.ts                  | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/extensions/extension-loader.ts b/src/extensions/extension-loader.ts
index c5339f31c9..643d9658bc 100644
--- a/src/extensions/extension-loader.ts
+++ b/src/extensions/extension-loader.ts
@@ -34,10 +34,7 @@ export class ExtensionLoader {
   }
 
   @action
-  async init(extensions?: Map<LensExtensionId, InstalledExtension>) {
-    if (extensions) {
-      this.extensions.replace(extensions);
-    }
+  async init() {
     if (ipcRenderer) {
       this.initRenderer()
     } else {
@@ -46,6 +43,10 @@ export class ExtensionLoader {
     extensionsStore.manageState(this);
   }
 
+  initExtensions(extensions?: Map<LensExtensionId, InstalledExtension>) {
+    this.extensions.replace(extensions)
+  }
+
   protected async initMain() {
     this.isLoaded = true;
     this.loadOnMain();
diff --git a/src/main/index.ts b/src/main/index.ts
index b25aed5bb2..e360c2fe85 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -78,8 +78,9 @@ app.on("ready", async () => {
     app.exit();
   }
 
+  extensionLoader.init()
   windowManager = WindowManager.getInstance<WindowManager>(proxyPort);
-  extensionLoader.init(await extensionManager.load()); // call after windowManager to see splash earlier
+  extensionLoader.initExtensions(await extensionManager.load()); // call after windowManager to see splash earlier
 
   setTimeout(() => {
     appEventBus.emit({ name: "service", action: "start" })