From 0a9b94443157fc5a78152107f50bfd1eb04fcede Mon Sep 17 00:00:00 2001
From: Skylot <skylot@gmail.com>
Date: Fri, 27 Dec 2019 18:42:07 +0000
Subject: [PATCH] refactor(gui): add on finish runnable to open action

---
 jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java b/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
index d99fd9cca..03cb9eacc 100644
--- a/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
+++ b/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
@@ -103,6 +103,7 @@ import jadx.gui.utils.NLS;
 import jadx.gui.utils.SystemInfo;
 import jadx.gui.utils.UiUtils;
 
+import static io.reactivex.internal.functions.Functions.EMPTY_RUNNABLE;
 import static javax.swing.KeyStroke.getKeyStroke;
 
 @SuppressWarnings("serial")
@@ -199,7 +200,8 @@ public class MainWindow extends JFrame {
 		if (settings.getFiles().isEmpty()) {
 			openFileOrProject();
 		} else {
-			open(Paths.get(settings.getFiles().get(0)));
+			Path openFile = Paths.get(settings.getFiles().get(0));
+			open(openFile, this::handleSelectClassOption);
 		}
 	}
 
@@ -304,9 +306,14 @@ public class MainWindow extends JFrame {
 	}
 
 	void open(Path path) {
+		open(path, EMPTY_RUNNABLE);
+	}
+
+	void open(Path path, Runnable onFinish) {
 		if (path.getFileName().toString().toLowerCase(Locale.ROOT)
 				.endsWith(JadxProject.PROJECT_EXTENSION)) {
 			openProject(path);
+			onFinish.run();
 		} else {
 			project.setFilePath(path);
 			clearTree();
@@ -316,8 +323,8 @@ public class MainWindow extends JFrame {
 						deobfToggleBtn.setSelected(settings.isDeobfuscationOn());
 						initTree();
 						update();
-						handleSelectClassOption();
 						runBackgroundJobs();
+						onFinish.run();
 					});
 		}
 	}
@@ -412,9 +419,8 @@ public class MainWindow extends JFrame {
 		File openedFile = wrapper.getOpenFile();
 		Map<String, Integer> openTabs = storeOpenTabs();
 		if (openedFile != null) {
-			open(openedFile.toPath());
+			open(openedFile.toPath(), () -> restoreOpenTabs(openTabs));
 		}
-		restoreOpenTabs(openTabs);
 	}
 
 	@NotNull