From 0f3085cc7363e7cb2adb7269ae6b71f4ca873c7f Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 14 Jan 2021 09:56:57 +0100
Subject: [PATCH] fixes #1476

---
 .../java/org/cryptomator/ui/launcher/UiLauncher.java     | 2 +-
 .../org/cryptomator/ui/traymenu/TrayMenuComponent.java   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

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 62e6b03f1..08461a56d 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
@@ -43,7 +43,7 @@ public class UiLauncher {
 	public void launch() {
 		boolean hidden = settings.startHidden().get();
 		if (SystemTray.isSupported() && settings.showTrayIcon().get()) {
-			trayMenu.get().addIconToSystemTray();
+			trayMenu.get().initializeTrayIcon();
 			launch(true, hidden);
 		} else {
 			launch(false, hidden);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuComponent.java b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuComponent.java
index 28ec8f35f..a4e068f8d 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuComponent.java
@@ -5,6 +5,7 @@
  *******************************************************************************/
 package org.cryptomator.ui.traymenu;
 
+import dagger.Lazy;
 import dagger.Subcomponent;
 
 import java.awt.SystemTray;
@@ -13,7 +14,7 @@ import java.awt.SystemTray;
 @Subcomponent
 public interface TrayMenuComponent {
 
-	TrayIconController trayIconController();
+	Lazy<TrayIconController> trayIconController();
 
 	/**
 	 * @return <code>true</code> if a tray icon can be installed
@@ -26,7 +27,7 @@ public interface TrayMenuComponent {
 	 * @return <code>true</code> if a tray icon has been installed
 	 */
 	default boolean isInitialized() {
-		return trayIconController().isInitialized();
+		return isSupported() && trayIconController().get().isInitialized();
 	}
 
 	/**
@@ -34,9 +35,9 @@ public interface TrayMenuComponent {
 	 *
 	 * @throws IllegalStateException If already added
 	 */
-	default void addIconToSystemTray() throws IllegalStateException {
+	default void initializeTrayIcon() throws IllegalStateException {
 		assert isSupported();
-		trayIconController().initializeTrayIcon();
+		trayIconController().get().initializeTrayIcon();
 	}
 
 	@Subcomponent.Builder