fix: adapt windows ready event from eventbus

Former-commit-id: b2df135
Voxelum · Jul 15, 2019 · d51abc4 · d51abc4
1 parent 4e007ee
commit d51abc4
Showing 1 changed file with 28 additions and 34 deletions.
diff --git a/src/main/material.js b/src/main/material.js
@@ -72,9 +72,6 @@ export default function setup(context, store) {
     context.configDock((dock) => {
     });
 
-
-    let waitForReady = true;
-
     context.ipcMain
         .on('window-hide', (event, id) => {
             id = id || event.sender.id;
@@ -110,7 +107,6 @@ export default function setup(context, store) {
             }
         })
         .on('minecraft-start', () => {
-            waitForReady = true;
         })
         .on('minecraft-exit', (status) => {
             if (mainRef) {
@@ -121,40 +117,38 @@ export default function setup(context, store) {
                 loggerRef = null;
             }
         })
-        .on('minecraft-stdout', (out) => {
-            if (waitForReady && out.indexOf('Reloading ResourceManager') !== -1 || out.indexOf('LWJGL Version: ') !== -1) {
-                waitForReady = false;
-
-                if (mainRef && mainRef.isVisible()) {
-                    mainRef.webContents.send('minecraft-window-ready');
-                    const { hideLauncher } = store.getters.selectedProfile;
-                    if (hideLauncher) {
-                        mainRef.hide();
-                    }
+        .on('minecraft-window-ready', () => {
+            if (mainRef && mainRef.isVisible()) {
+                mainRef.webContents.send('minecraft-window-ready');
+                const { hideLauncher } = store.getters.selectedProfile;
+                if (hideLauncher) {
+                    mainRef.hide();
                 }
+            }
 
-                if (loggerRef === undefined && store.getters.selectedProfile.showLog) {
-                    createLoggerWindow();
-                }
+            if (loggerRef === undefined && store.getters.selectedProfile.showLog) {
+                createLoggerWindow();
+            }
 
-                context.configDock((dock) => {
-                    dock.setMenu(Menu.buildFromTemplate([
-                        {
-                            label: 'Show Log',
-                            type: 'normal',
-                            click() {
-                                if (!loggerRef) {
-                                    createLoggerWindow();
-                                } else if (!loggerRef.isVisible()) {
-                                    loggerRef.show();
-                                } else {
-                                    loggerRef.focus();
-                                }
-                            },
+            context.configDock((dock) => {
+                dock.setMenu(Menu.buildFromTemplate([
+                    {
+                        label: 'Show Log',
+                        type: 'normal',
+                        click() {
+                            if (!loggerRef) {
+                                createLoggerWindow();
+                            } else if (!loggerRef.isVisible()) {
+                                loggerRef.show();
+                            } else {
+                                loggerRef.focus();
+                            }
                         },
-                    ]));
-                });
-            }
+                    },
+                ]));
+            });
+        })
+        .on('minecraft-stdout', (out) => {
             if (loggerRef) {
                 loggerRef.webContents.send('minecraft-stdout', out);
             }