瀏覽代碼

minor ui state tweaks
[ci skip]

Sebastian Stenzel 5 年之前
父節點
當前提交
62676d5a83

+ 2 - 0
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) {

+ 1 - 1
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 {