fix #1820: minimize on close on macOS

keeweb · May 19, 2021 · f0426a3 · f0426a3
1 parent b2d6781
commit f0426a3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/app/scripts/comp/launcher/launcher-electron.js b/app/scripts/comp/launcher/launcher-electron.js
@@ -191,7 +191,7 @@ const Launcher = {
         }
     },
     quitOnRealQuitEventIfMinimizeOnQuitIsEnabled() {
-        return !!(this.platform() === 'darwin' || this.pendingUpdateFile);
+        return !!this.pendingUpdateFile;
     },
     minimizeApp() {
         this.remoteApp().minimizeApp({

diff --git a/desktop/main.js b/desktop/main.js
@@ -202,7 +202,9 @@ main.minimizeApp = function (menuItemLabels) {
     if (!appIcon) {
         const image = electron.nativeImage.createFromPath(path.join(__dirname, 'img', imagePath));
         appIcon = new electron.Tray(image);
-        appIcon.on('click', restoreMainWindow);
+        if (process.platform !== 'darwin') {
+            appIcon.on('click', restoreMainWindow);
+        }
         const contextMenu = electron.Menu.buildFromTemplate([
             { label: menuItemLabels.restore, click: restoreMainWindow },
             { label: menuItemLabels.quit, click: closeMainWindow }

diff --git a/release-notes.md b/release-notes.md
@@ -3,6 +3,7 @@ Release notes
 ##### v1.18.6 (2021-05-19)
 `-` fix #1824: saving KDBX3 files with compression disabled  
 `-` fix #1818: extension connection error if browser cannot be identified  
+`-` fix #1820: minimize on close on macOS  
 
 ##### v1.18.5 (2021-05-14)
 `-` fix #1816: old Chromium support, such as Android Edge