Merge pull request #205 from meetfranz/feature/win-window-restore

Open Window when app is pinned to taskbar and minimized to system tray

2 files changed, 8 insertions, 6 deletions

diff --git a/package.json b/package.json
index dcb05bf6a..56c02ddf2 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,6 @@
     "classnames": "^2.2.5",
     "electron-fetch": "^1.1.0",
     "electron-spellchecker": "^1.2.0",
-    "electron-squirrel-startup": "^1.0.0",
     "electron-updater": "^2.4.3",
     "electron-window-state": "^4.1.0",
     "fs-extra": "^3.0.1",
diff --git a/src/index.js b/src/index.js
index 030736fee..a72d76f3a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,18 +2,14 @@ import { app, BrowserWindow, shell } from 'electron';
 import fs from 'fs-extra';
 import path from 'path';
 
-/* eslint-disable */
-if (require('electron-squirrel-startup')) app.quit();
-
 import windowStateKeeper from 'electron-window-state';
 
 import { isDevMode, isWindows } from './environment';
 import ipcApi from './electron/ipc-api';
 import Tray from './lib/Tray';
 import Settings from './electron/Settings';
-import { appId } from './package.json';
+import { appId } from './package.json'; // eslint-disable-line import/no-unresolved
 import './electron/exception';
-/* eslint-enable */
 
 // Keep a global reference of the window object, if you don't, the window will

 // be closed automatically when the JavaScript object is garbage collected.

@@ -114,6 +110,13 @@ const createWindow = async () => {
     app.isMaximized = true;
   });
 
+  mainWindow.on('close', (e) => {
+    if (settings.get('minimizeToSystemTray')) {
+      e.preventDefault();
+      mainWindow.minimize();
+    }
+  });
+
   mainWindow.on('unmaximize', () => {
     app.isMaximized = false;
   });