From bdd7fc0e35f0ccaba938007b17d7d58a6b560773 Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Fri, 20 Nov 2020 07:51:44 +0300
Subject: [PATCH] Revert "fix extensionLoader error on dev environments where
 renderer might start early (#1447)"

This reverts commit 8a3613ac6f4aa9b8686a4a08abce6f351ffeed04.
---
 src/extensions/extension-loader.ts | 9 ++++-----
 src/main/index.ts                  | 3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

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