From 62676d5a8330951a1e65bc931ecb8a4450bfa544 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 13 Feb 2020 14:32:23 +0100
Subject: [PATCH] minor ui state tweaks [ci skip]

---
 .../src/main/java/org/cryptomator/launcher/Cryptomator.java     | 2 ++
 .../src/main/java/org/cryptomator/ui/launcher/UiLauncher.java   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/main/launcher/src/main/java/org/cryptomator/launcher/Cryptomator.java b/main/launcher/src/main/java/org/cryptomator/launcher/Cryptomator.java
index 04eb9448d..763720d98 100644
--- a/main/launcher/src/main/java/org/cryptomator/launcher/Cryptomator.java
+++ b/main/launcher/src/main/java/org/cryptomator/launcher/Cryptomator.java
@@ -5,6 +5,7 @@
  *******************************************************************************/
 package org.cryptomator.launcher;
 
+import javafx.application.Platform;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.logging.DebugMode;
 import org.cryptomator.logging.LoggerConfiguration;
@@ -90,6 +91,7 @@ public class Cryptomator {
 		try {
 			uiLauncher.launch();
 			shutdownLatch.await();
+			Platform.exit();
 			LOG.info("UI shut down");
 			return 0;
 		} catch (InterruptedException e) {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncher.java b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncher.java
index 538d69602..4eab204ac 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncher.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncher.java
@@ -48,7 +48,7 @@ public class UiLauncher {
 		}
 
 		// show window on start?
-		if (settings.startHidden().get()) {
+		if (hasTrayIcon && settings.startHidden().get()) {
 			LOG.debug("Hiding application...");
 			macFunctions.map(MacFunctions::uiState).ifPresent(JniException.ignore(MacApplicationUiState::transformToAgentApplication));
 		} else {