MacOS exit to tray

src/components/shared/setDefaultSettings.ts

@@ -1,6 +1,7 @@
 import settings from 'electron-settings';
 import path from 'path';
 import i18n from '../../i18n/i18n';
+import { isMacOS } from '../../shared/utils';
 
 const setDefaultSettings = (force: boolean) => {
   if (force || !settings.hasSync('discord.enabled')) {
@@ -76,7 +77,11 @@ const setDefaultSettings = (force: boolean) => {
   }
 
   if (force || !settings.hasSync('exitToTray')) {
-    settings.setSync('exitToTray', false);
+    let defaultExitToTray = false;
+    if (isMacOS()) {
+      defaultExitToTray = true;
+    }
+    settings.setSync('exitToTray', defaultExitToTray);
   }
 
   if (force || !settings.hasSync('showDebugWindow')) {

src/main.dev.js

@@ -49,6 +49,7 @@ replayActionMain(store);
 let mainWindow = null;
 let tray = null;
 let exitFromTray = false;
+let forceQuit = false;
 
 if (process.env.NODE_ENV === 'production') {
   const sourceMapSupport = require('source-map-support');
@@ -538,6 +539,9 @@ const createWindow = async () => {
       event.preventDefault();
       mainWindow.hide();
     }
+    if (forceQuit) {
+      app.exit();
+    }
   });
 
   if (isWindows()) {
@@ -586,6 +590,10 @@ const createWindow = async () => {
         height: window.height,
       });
     });
+
+    app.on('before-quit', () => {
+      forceQuit = true;
+    });
   }
 
   mainWindow.once('maximize', () => {

src/menu.ts

@@ -68,7 +68,7 @@ export default class MenuBuilder {
           label: 'Quit',
           accelerator: 'Command+Q',
           click: () => {
-            app.quit();
+            app.exit();
           },
         },
       ],