Merge pull request #411 from win32kbase/master

Fix #364

Author: Col-E

pom.xml

@@ -3,7 +3,7 @@
 	<groupId>me.coley</groupId>
 	<artifactId>recaf</artifactId>
 	<url>https://github.com/Col-E/Recaf/</url>
-	<version>2.21.2</version>
+	<version>2.21.3</version>
 	<name>Recaf</name>
 	<description>A modern java bytecode editor</description>
 	<!-- Variables -->

src/main/java/me/coley/recaf/Recaf.java

@@ -31,7 +31,7 @@
  * @author Matt
  */
 public class Recaf {
-	public static final String VERSION = "2.21.2";
+	public static final String VERSION = "2.21.3";
 	public static final String DOC_URL = "https://col-e.github.io/Recaf-documentation/";
 	public static final int ASM_VERSION = Opcodes.ASM9;
 	private static Controller currentController;

src/main/java/me/coley/recaf/ui/controls/text/JavaEditorPane.java

@@ -104,7 +104,7 @@ public void setText(String text) {
 	public Map<String, byte[]> save(String name) {
 		if (!canCompile())
 			throw new UnsupportedOperationException("Recompilation not supported in read-only mode");
-		List<String> path = null;
+		List<String> path;
 		try {
 			path = getClassPath();
 		} catch(IOException e) {
@@ -135,12 +135,17 @@ public Map<String, byte[]> save(String name) {
 	@Override
 	public void selectMember(String name, String desc) {
 		// Delay until analysis has run
-		while(code == null || (code.getUnit() == null && hasNoErrors()))
+		if (code == null) {
+			// Reschedule the check
 			try {
 				Thread.sleep(50);
-			} catch(InterruptedException ex) { /* ignored */ }
+			} catch (Exception e) { /* ignored */ }
+			ThreadUtil.run(() -> selectMember(name, desc));
+			return;
+		}
+
 		// Select member if unit analysis was a success
-		if (code != null && code.getUnit() != null) {
+		if (code.getUnit() != null) {
 			// Jump to range if found
 			Optional<Range> range = JavaParserUtil.getMemberRange(code.getUnit(), name, desc);
 			if(range.isPresent()) {