Add checks for isDestroyed on window shows (#1723)

* Add checks for isdestroyed * more checks * Update src/main/gui/splash.ts Co-authored-by: Michael Schmidt <mitchi5000.ms@googlemail.com> --------- Co-authored-by: Michael Schmidt <mitchi5000.ms@googlemail.com>
chaiNNer-org · Apr 9, 2023 · 04ba6fe · 04ba6fe
1 parent 1140512
commit 04ba6fe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/main/gui/main-window.ts b/src/main/gui/main-window.ts
@@ -355,6 +355,16 @@ export const createMainWindow = async (args: OpenArguments) => {
         ipcMain.once('backend-ready', () => {
             progressController.submitProgress({ totalProgress: 1 });
 
+            if (mainWindow.isDestroyed()) {
+                dialog.showMessageBoxSync({
+                    type: 'error',
+                    title: 'Unable to start application',
+                    message: 'The main window was closed before the backend was ready.',
+                });
+                app.quit();
+                return;
+            }
+
             mainWindow.show();
             if (lastWindowSize?.maximized) {
                 mainWindow.maximize();

diff --git a/src/main/gui/splash.ts b/src/main/gui/splash.ts
@@ -62,12 +62,13 @@ export const addSplashScreen = (monitor: ProgressMonitor) => {
     }, 100);
 
     splash.once('ready-to-show', () => {
-        splash.show();
+        if (!splash.isDestroyed()) {
+            splash.show();
+        }
     });
 
     monitor.addProgressListener((progress) => {
         lastProgress = { ...progress };
-        splash.webContents.send('splash-setup-progress', progress);
 
         if (progress.totalProgress === 1) {
             progressFinished = true;
@@ -80,7 +81,9 @@ export const addSplashScreen = (monitor: ProgressMonitor) => {
 
         let messageBoxOptions: MessageBoxOptions;
         if (interrupt.type === 'critical error') {
-            splash.hide();
+            if (!splash.isDestroyed()) {
+                splash.hide();
+            }
 
             messageBoxOptions = {
                 type: 'error',