diff --git a/pom.xml b/pom.xml
index cfe5c7e55..e6ec12417 100644
--- a/pom.xml
+++ b/pom.xml
@@ -258,6 +258,10 @@
${dagger.version}
+
+ -Adagger.fastInit=enabled
+ -Adagger.formatGeneratedSource=enabled
+
diff --git a/src/main/java/org/cryptomator/launcher/Cryptomator.java b/src/main/java/org/cryptomator/launcher/Cryptomator.java
index 9f31fb223..5f520199e 100644
--- a/src/main/java/org/cryptomator/launcher/Cryptomator.java
+++ b/src/main/java/org/cryptomator/launcher/Cryptomator.java
@@ -5,6 +5,7 @@
*******************************************************************************/
package org.cryptomator.launcher;
+import dagger.Lazy;
import org.apache.commons.lang3.SystemUtils;
import org.cryptomator.logging.DebugMode;
import org.cryptomator.logging.LoggerConfiguration;
@@ -32,10 +33,10 @@ public class Cryptomator {
private final IpcFactory ipcFactory;
private final Optional applicationVersion;
private final CountDownLatch shutdownLatch;
- private final UiLauncher uiLauncher;
+ private final Lazy uiLauncher;
@Inject
- Cryptomator(LoggerConfiguration logConfig, DebugMode debugMode, IpcFactory ipcFactory, @Named("applicationVersion") Optional applicationVersion, @Named("shutdownLatch") CountDownLatch shutdownLatch, UiLauncher uiLauncher) {
+ Cryptomator(LoggerConfiguration logConfig, DebugMode debugMode, IpcFactory ipcFactory, @Named("applicationVersion") Optional applicationVersion, @Named("shutdownLatch") CountDownLatch shutdownLatch, Lazy uiLauncher) {
this.logConfig = logConfig;
this.debugMode = debugMode;
this.ipcFactory = ipcFactory;
@@ -89,7 +90,7 @@ public class Cryptomator {
*/
private int runGuiApplication() {
try {
- uiLauncher.launch();
+ uiLauncher.get().launch();
shutdownLatch.await();
LOG.info("UI shut down");
return 0;