GH-473 Fix extra launcher windows opening after java version warning

SKCraft · May 30, 2022 · 16f44a8 · 16f44a8
1 parent 4decceb
commit 16f44a8
Showing 1 changed file with 27 additions and 22 deletions.
diff --git a/launcher/src/main/java/com/skcraft/launcher/launch/LaunchSupervisor.java b/launcher/src/main/java/com/skcraft/launcher/launch/LaunchSupervisor.java
@@ -14,6 +14,7 @@
 import com.skcraft.launcher.Launcher;
 import com.skcraft.launcher.auth.Session;
 import com.skcraft.launcher.dialog.AccountSelectDialog;
+import com.skcraft.launcher.dialog.ProcessConsoleFrame;
 import com.skcraft.launcher.dialog.ProgressDialog;
 import com.skcraft.launcher.launch.LaunchOptions.UpdatePolicy;
 import com.skcraft.launcher.launch.runtime.JavaRuntime;
@@ -27,11 +28,13 @@
 import lombok.extern.java.Log;
 import org.apache.commons.io.FileUtils;
 
+import javax.annotation.Nullable;
 import javax.swing.*;
 import java.awt.*;
 import java.io.File;
 import java.io.IOException;
 import java.util.Date;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.function.BiPredicate;
 import java.util.logging.Level;
@@ -136,12 +139,7 @@ private void launch(Window window, Instance instance, Session session, final Lau
         Futures.addCallback(processFuture, new FutureCallback<Process>() {
             @Override
             public void onSuccess(Process result) {
-                SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        listener.gameStarted();
-                    }
-                });
+                SwingUtilities.invokeLater(listener::gameStarted);
             }
 
             @Override
@@ -150,29 +148,36 @@ public void onFailure(Throwable t) {
         });
 
         // Watch the created process
-        ListenableFuture<?> future = Futures.transform(
+        ListenableFuture<ProcessConsoleFrame> future = Futures.transform(
                 processFuture, new LaunchProcessHandler(launcher), launcher.getExecutor());
         SwingHelper.addErrorDialogCallback(null, future);
 
         // Clean up at the very end
-        future.addListener(new Runnable() {
+        future.addListener(() -> {
+            try {
+                log.info("Process ended; cleaning up " + extractDir.getAbsolutePath());
+                FileUtils.deleteDirectory(extractDir);
+            } catch (IOException e) {
+                log.log(Level.WARNING, "Failed to clean up " + extractDir.getAbsolutePath(), e);
+            }
+        }, sameThreadExecutor());
+
+        // Hook up launch listener
+        Futures.addCallback(future, new FutureCallback<ProcessConsoleFrame>() {
             @Override
-            public void run() {
-                try {
-                    log.info("Process ended; cleaning up " + extractDir.getAbsolutePath());
-                    FileUtils.deleteDirectory(extractDir);
-                } catch (IOException e) {
-                    log.log(Level.WARNING, "Failed to clean up " + extractDir.getAbsolutePath(), e);
-                }
+            public void onSuccess(@Nullable ProcessConsoleFrame result) {
+                // gameStarted was only invoked on success above, so only call gameClosed on success
+                listener.gameClosed();
+            }
 
-                SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        listener.gameClosed();
-                    }
-                });
+            @Override
+            public void onFailure(Throwable t) {
+                // likely user cancellation
+                if (!(t instanceof CancellationException)) {
+                    log.info("Process failure: " + t.getLocalizedMessage());
+                }
             }
-        }, sameThreadExecutor());
+        }, SwingExecutor.INSTANCE);
     }
 
     @RequiredArgsConstructor