From cc0763c7c1fc3474ae121525ed29782fe617e86e Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Fri, 21 Jul 2023 18:56:33 +0000
Subject: [PATCH] Properly handle launcher errors

---
 .../io/xpipe/app/launcher/LauncherCommand.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/launcher/LauncherCommand.java b/app/src/main/java/io/xpipe/app/launcher/LauncherCommand.java
index 47bf8c3eb..8aa26fb15 100644
--- a/app/src/main/java/io/xpipe/app/launcher/LauncherCommand.java
+++ b/app/src/main/java/io/xpipe/app/launcher/LauncherCommand.java
@@ -41,17 +41,17 @@ public static void runLauncher(String[] args) {
 
         var cmd = new CommandLine(new LauncherCommand());
         cmd.setExecutionExceptionHandler((ex, commandLine, parseResult) -> {
-            new LogErrorHandler()
-                    .handle(ErrorEvent.fromThrowable("Launcher command error occurred", ex)
-                            .build());
-            OperationMode.halt(1);
+            var event = ErrorEvent.fromThrowable("Launcher command error occurred", ex).term().build();
+            // Print error in case we launched from the command-line
+            new LogErrorHandler().handle(event);
+            event.handle();
             return 1;
         });
         cmd.setParameterExceptionHandler((ex, args1) -> {
-            new LogErrorHandler()
-                    .handle(ErrorEvent.fromThrowable("Launcher parameter error occurred", ex)
-                            .build());
-            OperationMode.halt(1);
+            var event = ErrorEvent.fromThrowable("Launcher parameter error occurred", ex).term().build();
+            // Print error in case we launched from the command-line
+            new LogErrorHandler().handle(event);
+            event.handle();
             return 1;
         });