From 76ce6e5c795d9ab5f5f7c7dd308715f8a16124f3 Mon Sep 17 00:00:00 2001
From: 2xsaiko
Date: Sun, 17 Jan 2021 14:14:21 +0100
Subject: Attempt fixing rare CME when loading a jar while tabs are open

---
 build.gradle                                                  |  2 +-
 .../src/main/java/cuchaz/enigma/gui/GuiController.java        | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8b0a2c50..639bc4b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ subprojects {
     }
 
     group = 'cuchaz'
-    version = '0.22.0'
+    version = '0.22.1'
 
     version = version + (System.getenv("GITHUB_ACTIONS") ? "" : "+local")
 
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
index 5217b25c..6fc91ab7 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
@@ -57,7 +57,10 @@ import cuchaz.enigma.translation.mapping.serde.MappingParseException;
 import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.translation.mapping.tree.HashEntryTree;
-import cuchaz.enigma.translation.representation.entry.*;
+import cuchaz.enigma.translation.representation.entry.ClassEntry;
+import cuchaz.enigma.translation.representation.entry.Entry;
+import cuchaz.enigma.translation.representation.entry.FieldEntry;
+import cuchaz.enigma.translation.representation.entry.MethodEntry;
 import cuchaz.enigma.utils.I18n;
 import cuchaz.enigma.utils.Utils;
 import cuchaz.enigma.utils.validation.ValidationContext;
@@ -97,8 +100,10 @@ public class GuiController implements ClientPacketHandler {
 			project = enigma.openJar(jarPath, new ClasspathClassProvider(), progress);
 			indexTreeBuilder = new IndexTreeBuilder(project.getJarIndex());
 			chp = new ClassHandleProvider(project, UiConfig.getDecompiler().service);
-			gui.onFinishOpenJar(jarPath.getFileName().toString());
-			refreshClasses();
+			SwingUtilities.invokeLater(() -> {
+				gui.onFinishOpenJar(jarPath.getFileName().toString());
+				refreshClasses();
+			});
 		});
 	}
 
-- 
cgit v1.2.3