From cd4f48269732d75fb99b0c93ee87f7334d27fbe3 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Mon, 25 Aug 2025 12:36:29 +0000
Subject: [PATCH] wt fixes

---
 .../main/java/io/xpipe/app/terminal/WindowsTerminalType.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalType.java
index da37cbac3..d2299ee16 100644
--- a/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalType.java
+++ b/app/src/main/java/io/xpipe/app/terminal/WindowsTerminalType.java
@@ -94,6 +94,7 @@ public interface WindowsTerminalType extends ExternalTerminalType, TrackableTerm
         newProfile.put("name", "XPipe");
         newProfile.put("closeOnExit", "always");
         newProfile.put("suppressApplicationTitle", true);
+        newProfile.putNull("startingDirectory");
         newProfile.put("elevate", false);
         if (!AppProperties.get().isDevelopmentEnvironment()) {
             var logoFile = AppInstallation.ofCurrent().getLogoPath();
@@ -187,10 +188,10 @@ public interface WindowsTerminalType extends ExternalTerminalType, TrackableTerm
             checkProfile();
             try (var sc = LocalShell.getShell().start()) {
                 var exec = getPath();
-                var wd = sc.view().pwd();
                 var spaces = configuration.getScriptFile().toString().contains(" ");
 
                 if (spaces) {
+                    var wd = sc.view().pwd();
                     sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration)))
                             .withWorkingDirectory(configuration.getScriptFile().getParent())
                             .execute();
@@ -243,10 +244,10 @@ public interface WindowsTerminalType extends ExternalTerminalType, TrackableTerm
             checkProfile();
             try (var sc = LocalShell.getShell().start()) {
                 var exec = getPath();
-                var wd = sc.view().pwd();
                 var spaces = configuration.getScriptFile().toString().contains(" ");
 
                 if (spaces) {
+                    var wd = sc.view().pwd();
                     sc.command(CommandBuilder.of().addFile(exec).add(toCommand(configuration))).withWorkingDirectory(
                             configuration.getScriptFile().getParent()).execute();
                     sc.view().cd(wd);