From 3accdcfc6bf17a6b3fc4dfc26b816ba16ec410de Mon Sep 17 00:00:00 2001
From: Leonard Hecker <lhecker@microsoft.com>
Date: Tue, 15 Apr 2025 22:22:09 +0200
Subject: [PATCH] Fix cwd not applying on launch (#18801)

---
 src/cascadia/TerminalApp/Remoting.cpp     | 2 +-
 src/cascadia/TerminalApp/Remoting.h       | 1 -
 src/cascadia/TerminalApp/TerminalPage.cpp | 7 +++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/cascadia/TerminalApp/Remoting.cpp b/src/cascadia/TerminalApp/Remoting.cpp
index 8383fb98fd..0c8693ed46 100644
--- a/src/cascadia/TerminalApp/Remoting.cpp
+++ b/src/cascadia/TerminalApp/Remoting.cpp
@@ -17,7 +17,7 @@ namespace winrt::TerminalApp::implementation
 {
     CommandlineArgs::CommandlineArgs(winrt::array_view<const winrt::hstring> args, winrt::hstring currentDirectory, uint32_t showWindowCommand, winrt::hstring envString) :
         _args{ args.begin(), args.end() },
-        _cwd{ std::move(currentDirectory) },
+        CurrentDirectory{ std::move(currentDirectory) },
         ShowWindowCommand{ showWindowCommand },
         CurrentEnvironment{ std::move(envString) }
     {
diff --git a/src/cascadia/TerminalApp/Remoting.h b/src/cascadia/TerminalApp/Remoting.h
index a86619c4dc..2ad297f31e 100644
--- a/src/cascadia/TerminalApp/Remoting.h
+++ b/src/cascadia/TerminalApp/Remoting.h
@@ -36,7 +36,6 @@ namespace winrt::TerminalApp::implementation
         ::TerminalApp::AppCommandlineArgs _parsed;
         int32_t _parseResult = 0;
         winrt::com_array<winrt::hstring> _args;
-        winrt::hstring _cwd;
     };
 
     struct RequestReceiveContentArgs : RequestReceiveContentArgsT<RequestReceiveContentArgs>
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
index fb061e548c..581b0ddcf3 100644
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -563,8 +563,11 @@ namespace winrt::TerminalApp::implementation
                 _WindowProperties.VirtualEnvVars(originalVirtualEnv);
             }
         });
-        _WindowProperties.VirtualWorkingDirectory(cwd);
-        _WindowProperties.VirtualEnvVars(env);
+        if (!cwd.empty())
+        {
+            _WindowProperties.VirtualWorkingDirectory(cwd);
+            _WindowProperties.VirtualEnvVars(env);
+        }
 
         for (size_t i = 0; i < actions.size(); ++i)
         {