From 0d0c123bfea145b25831eec9633e74b1fdf8bf2f Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Sun, 6 Sep 2026 08:15:35 +0000
Subject: [PATCH] Fix install relaunch

---
 app/src/main/java/io/xpipe/app/core/AppRestart.java     | 7 +++----
 app/src/main/java/io/xpipe/app/update/AppInstaller.java | 6 ++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/core/AppRestart.java b/app/src/main/java/io/xpipe/app/core/AppRestart.java
index deb3212ec..a6f5daedc 100644
--- a/app/src/main/java/io/xpipe/app/core/AppRestart.java
+++ b/app/src/main/java/io/xpipe/app/core/AppRestart.java
@@ -29,10 +29,9 @@ public class AppRestart {
             var b = CommandBuilder.of().addFile(exec).add("open").addAll(arguments);
             return b.buildSimple();
         } else {
-            var exe = loc.getDaemonExecutablePath();
-            var b = CommandBuilder.of().addFile(exe).addAll(arguments);
-            var async = dialect.launchAsync(b, true);
-            return async.buildSimple();
+            var exec = loc.getCliExecutablePath();
+            var b = CommandBuilder.of().add(ShellDialects.isPowershell(dialect) ? "&" : null).addFile(exec).add("open").addAll(arguments);
+            return b.buildSimple();
         }
     }
 
diff --git a/app/src/main/java/io/xpipe/app/update/AppInstaller.java b/app/src/main/java/io/xpipe/app/update/AppInstaller.java
index ba18349ec..08656c1f0 100644
--- a/app/src/main/java/io/xpipe/app/update/AppInstaller.java
+++ b/app/src/main/java/io/xpipe/app/update/AppInstaller.java
@@ -153,8 +153,7 @@ public class AppInstaller {
                         file,
                         logFile,
                         args,
-                        AppRestart.getBackgroundRestartCommand(
-                                AppProperties.get().getDataDir(), ShellDialects.CMD));
+                        AppRestart.getTerminalRestartCommand(ShellDialects.CMD));
             }
 
             private String getPowershellCommand(String file, String logFile, boolean uninstall, boolean systemWide) {
@@ -190,8 +189,7 @@ public class AppInstaller {
                         file,
                         logFile,
                         startProcessProperty,
-                        AppRestart.getBackgroundRestartCommand(
-                                AppProperties.get().getDataDir(), ShellDialects.POWERSHELL));
+                        AppRestart.getTerminalRestartCommand(ShellDialects.POWERSHELL));
             }
         }