From e9f9f8f29f2504bb750ea0af11840c1aa746b476 Mon Sep 17 00:00:00 2001
From: gegy1000
Date: Wed, 19 Jun 2019 20:28:01 +0200
Subject: Only open mappings once jar is loaded

---
 src/main/java/cuchaz/enigma/Main.java | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'src/main/java/cuchaz/enigma/Main.java')

diff --git a/src/main/java/cuchaz/enigma/Main.java b/src/main/java/cuchaz/enigma/Main.java
index 1f2cb84..b778946 100644
--- a/src/main/java/cuchaz/enigma/Main.java
+++ b/src/main/java/cuchaz/enigma/Main.java
@@ -62,16 +62,17 @@ public class Main {
 
 			if (options.has(jar)) {
 				Path jarPath = options.valueOf(jar);
-				controller.openJar(jarPath);
-			}
-
-			if (options.has(mappings)) {
-				Path mappingsPath = options.valueOf(mappings);
-				if (Files.isDirectory(mappingsPath)) {
-					controller.openMappings(MappingFormat.ENIGMA_DIRECTORY, mappingsPath);
-				} else {
-					controller.openMappings(MappingFormat.ENIGMA_FILE, mappingsPath);
-				}
+				controller.openJar(jarPath)
+						.whenComplete((v, t) -> {
+							if (options.has(mappings)) {
+								Path mappingsPath = options.valueOf(mappings);
+								if (Files.isDirectory(mappingsPath)) {
+									controller.openMappings(MappingFormat.ENIGMA_DIRECTORY, mappingsPath);
+								} else {
+									controller.openMappings(MappingFormat.ENIGMA_FILE, mappingsPath);
+								}
+							}
+						});
 			}
 		} catch (OptionException e) {
 			System.out.println("Invalid arguments: " + e.getMessage());
-- 
cgit v1.2.3