fix(Windows): Fix losing window when "Keep Franz in background" is enabled

Author: adlk

src/index.js

@@ -223,20 +223,24 @@ const createWindow = () => {
 
   // Emitted when the window is closed.
   mainWindow.on('close', (e) => {
+    debug('Window: close window');
     // Dereference the window object, usually you would store windows
     // in an array if your app supports multi windows, this is the time
     // when you should delete the corresponding element.
     if (!willQuitApp && (settings.get('runInBackground') === undefined || settings.get('runInBackground'))) {
       e.preventDefault();
       if (isWindows) {
+        debug('Window: minimize');
         mainWindow.minimize();
+
+        if (settings.get('minimizeToSystemTray')) {
+          debug('Skip taskbar: true');
+          mainWindow.setSkipTaskbar(true);
+        }
       } else {
+        debug('Window: hide');
         mainWindow.hide();
       }
-
-      if (isWindows) {
-        mainWindow.setSkipTaskbar(true);
-      }
     } else {
       app.quit();
     }
@@ -248,39 +252,47 @@ const createWindow = () => {
     app.wasMaximized = app.isMaximized;
 
     if (settings.get('minimizeToSystemTray')) {
+      debug('Skip taskbar: true');
       mainWindow.setSkipTaskbar(true);
       trayIcon.show();
     }
   });
 
   mainWindow.on('maximize', () => {
+    debug('Window: maximize');
     app.isMaximized = true;
   });
 
   mainWindow.on('unmaximize', () => {
+    debug('Window: unmaximize');
     app.isMaximized = false;
   });
 
   mainWindow.on('restore', () => {
+    debug('Window: restore');
     mainWindow.setSkipTaskbar(false);
 
     if (app.wasMaximized) {
+      debug('Window: was maximized before, maximize window');
       mainWindow.maximize();
     }
 
     if (!settings.get('enableSystemTray')) {
+      debug('Tray: hiding tray icon');
       trayIcon.hide();
     }
   });
 
   mainWindow.on('show', () => {
+    debug('Skip taskbar: false');
     mainWindow.setSkipTaskbar(false);
   });
 
   app.mainWindow = mainWindow;
   app.isMaximized = mainWindow.isMaximized();
 
   mainWindow.webContents.on('new-window', (e, url) => {
+    debug('Open url', url);
     e.preventDefault();
     shell.openExternal(url);
   });
@@ -360,7 +372,10 @@ app.on('window-all-closed', () => {
   // to stay active until the user quits explicitly with Cmd + Q
   if (settings.get('runInBackground') === undefined
     || settings.get('runInBackground')) {
+    debug('Window: all windows closed, quit app');
     app.quit();
+  } else {
+    debug('Window: don\'t quit app');
   }
 });