Fix exception when application is launched with arguments

hanyu0504 · Apr 8, 2019 · d64f946 · d64f946
1 parent c408b63
commit d64f946
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/app/src/main/java/org/jd/gui/App.java b/app/src/main/java/org/jd/gui/App.java
@@ -59,8 +59,7 @@ public static void main(String[] args) {
 
             // Create main controller and show main frame
             controller = new MainController(configuration);
-            controller.show();
-            controller.openFiles(newList(args));
+            controller.show(newList(args));
 		}
 	}
 

diff --git a/app/src/main/java/org/jd/gui/controller/MainController.java b/app/src/main/java/org/jd/gui/controller/MainController.java
@@ -111,13 +111,13 @@ public MainController(Configuration configuration) {
 
 	// --- Show GUI --- //
     @SuppressWarnings("unchecked")
-	public void show() {
+	public void show(List<File> files) {
         SwingUtil.invokeLater(() -> {
             // Show main frame
-            mainView.show(
-                    configuration.getMainWindowLocation(),
-                    configuration.getMainWindowSize(),
-                    configuration.isMainWindowMaximize());
+            mainView.show(configuration.getMainWindowLocation(), configuration.getMainWindowSize(), configuration.isMainWindowMaximize());
+            if (!files.isEmpty()) {
+                openFiles(files);
+            }
         });
 
         // Background initializations