From 6a5f21e5f28bca0cd0ee6710eca4814a7eccc418 Mon Sep 17 00:00:00 2001
From: Johannes Millan <johannes.millan@gmail.com>
Date: Mon, 9 Sep 2024 15:17:24 +0200
Subject: [PATCH] fix: windows crashing issue on minimize #3423

---
 electron/common.const.ts |  1 +
 electron/main-window.ts  | 14 +++++++++-----
 electron/start-app.ts    |  1 -
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 electron/common.const.ts

diff --git a/electron/common.const.ts b/electron/common.const.ts
new file mode 100644
index 000000000..df1ce6f65
--- /dev/null
+++ b/electron/common.const.ts
@@ -0,0 +1 @@
+export const IS_MAC = process.platform === 'darwin';
diff --git a/electron/main-window.ts b/electron/main-window.ts
index bb99d5647..dd91ad9c6 100644
--- a/electron/main-window.ts
+++ b/electron/main-window.ts
@@ -17,6 +17,7 @@ import { getSettings } from './get-settings';
 import { readFileSync, stat } from 'fs';
 import { error, log } from 'electron-log/main';
 import { GlobalConfigState } from '../src/app/features/config/global-config.model';
+import { IS_MAC } from './common.const';
 
 let mainWin: BrowserWindow;
 
@@ -42,14 +43,12 @@ export const getIsAppReady = (): boolean => {
 export const createWindow = ({
   IS_DEV,
   ICONS_FOLDER,
-  IS_MAC,
   quitApp,
   app,
   customUrl,
 }: {
   IS_DEV: boolean;
   ICONS_FOLDER: string;
-  IS_MAC: boolean;
   quitApp: () => void;
   app: App;
   customUrl?: string;
@@ -242,7 +241,10 @@ const appCloseHandler = (app: App): void => {
       getSettings(mainWin, (appCfg: GlobalConfigState) => {
         if (appCfg && appCfg.misc.isMinimizeToTray && !(app as any).isQuiting) {
           mainWin.hide();
-          app.dock.hide();
+
+          if (IS_MAC) {
+            app.dock.hide();
+          }
           return;
         }
 
@@ -274,8 +276,10 @@ const appMinimizeHandler = (app: App): void => {
         if (appCfg.misc.isMinimizeToTray) {
           event.preventDefault();
           mainWin.hide();
-          app.dock.hide();
-        } else {
+          if (IS_MAC) {
+            app.dock.hide();
+          }
+        } else if (IS_MAC) {
           app.dock.show();
         }
       });
diff --git a/electron/start-app.ts b/electron/start-app.ts
index f3a6c5f25..f993b8340 100644
--- a/electron/start-app.ts
+++ b/electron/start-app.ts
@@ -255,7 +255,6 @@ export const startApp = (): void => {
       app,
       IS_DEV,
       ICONS_FOLDER,
-      IS_MAC,
       quitApp,
       customUrl,
     });