Don't minimize to the tray icon if there is no tray icon.

sedwards2009 · Dec 21, 2018 · fa38971 · fa38971
1 parent 1af2d5d
commit fa38971
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/extraterm/src/main_process/Main.ts b/extraterm/src/main_process/Main.ts
@@ -271,7 +271,7 @@ function maximizeAllWindows(): void {
 function minimizeAllWindows(): void {
   for (const window of BrowserWindow.getAllWindows()) {
     const generalConfig = <GeneralConfig> configDatabase.getConfig(GENERAL_CONFIG);
-    if (generalConfig.minimizeToTray) {
+    if (generalConfig.showTrayIcon && generalConfig.minimizeToTray) {
       window.hide();
     } else {
       window.minimize();
@@ -291,7 +291,7 @@ function restoreAllWindows(): void {
       const bounds = generalConfig.windowConfiguration[0];
       window.setBounds(bounds);
         window.setMinimumSize(bounds.width, bounds.height);
-      if (generalConfig.minimizeToTray) {
+      if (generalConfig.showTrayIcon && generalConfig.minimizeToTray) {
         window.show();
       }
       window.restore();
@@ -302,7 +302,7 @@ function restoreAllWindows(): void {
     } else {
 
       // Windows and macOS
-      if (generalConfig.minimizeToTray) {
+      if (generalConfig.showTrayIcon && generalConfig.minimizeToTray) {
         window.show();
       }
       window.restore();