fix(desktop): ensure app fully exits on window close

mayneyao · Oct 23, 2024 · e342143 · e342143
1 parent 5ab91d2
commit e342143
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/electron/main.ts b/electron/main.ts
@@ -152,17 +152,26 @@ function createTray() {
     }
 }
 
+function destroyTray() {
+    if (tray) {
+        tray.destroy();
+        tray = null;
+    }
+}
+
 app.whenReady().then(() => {
     win = createWindow()
     createTray();
 
     win.on('close', (event) => {
         if (!forceQuit) {
-            event.preventDefault();
             if (process.platform === 'darwin') {
+                event.preventDefault();
                 win?.hide();
             } else {
-                win?.minimize();
+                forceQuit = true;
+                destroyTray();
+                app.quit();
             }
         }
     });
@@ -178,5 +187,6 @@ app.on('activate', () => {
 
 ipcMain.handle('quit-app', () => {
     forceQuit = true;
+    destroyTray();
     app.quit();
 });