Revert "fix extensionLoader error on dev environments where renderer might start early (#1447)"

This reverts commit 8a3613ac6f.
This commit is contained in:
Alex Andreev committed 2020-11-20 07:51:44 +03:00
1 parent cde9868dc2
commit bdd7fc0e35
2 files changed
+5 -7

No files matched your search

+4 -5
View File
@@ -34,7 +34,10 @@ export class ExtensionLoader {
} }
@action @action
async init() { async init(extensions?: Map<LensExtensionId, InstalledExtension>) {
if (extensions) {
this.extensions.replace(extensions);
}
if (ipcRenderer) { if (ipcRenderer) {
this.initRenderer() this.initRenderer()
} else { } else {
@@ -43,10 +46,6 @@ export class ExtensionLoader {
extensionsStore.manageState(this); extensionsStore.manageState(this);
} }
initExtensions(extensions?: Map<LensExtensionId, InstalledExtension>) {
this.extensions.replace(extensions)
}
protected async initMain() { protected async initMain() {
this.isLoaded = true; this.isLoaded = true;
this.loadOnMain(); this.loadOnMain();
+1 -2
View File
@@ -78,9 +78,8 @@ app.on("ready", async () => {
app.exit(); app.exit();
} }
extensionLoader.init()
windowManager = WindowManager.getInstance<WindowManager>(proxyPort); 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(() => { setTimeout(() => {
appEventBus.emit({ name: "service", action: "start" }) appEventBus.emit({ name: "service", action: "start" })