Skip to content

fix(windows): refresh terminal environment from registry on launch #2605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
weiningwei wants to merge 2 commits into
base: develop
Choose a base branch
from
+32 −0
Open

fix(windows): refresh terminal environment from registry on launch #2605

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7ce88c
fix(windows): set UseShellExecute to true when launching terminal
weiningwei Aug 3, 2026
6ac97b7
fix: refresh terminal environment from registry to avoid stale env
weiningwei Aug 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions src/Native/Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,41 @@ public void OpenTerminal(string workdir, string args)
startInfo.WorkingDirectory = cwd;
startInfo.FileName = terminal;
startInfo.Arguments = args;
RefreshEnvFromRegistry(startInfo);
Process.Start(startInfo);
}

private static void RefreshEnvFromRegistry(ProcessStartInfo startInfo)
{
// Read latest machine and user environment from registry, so that
// environment changes made after SourceGit started are picked up.
var machine = Environment.GetEnvironmentVariables(EnvironmentVariableTarget.Machine);
var user = Environment.GetEnvironmentVariables(EnvironmentVariableTarget.User);

foreach (System.Collections.DictionaryEntry kv in machine)
startInfo.Environment[kv.Key.ToString()] = kv.Value?.ToString() ?? "";

foreach (System.Collections.DictionaryEntry kv in user)
{
var key = kv.Key.ToString();
var value = kv.Value?.ToString() ?? "";
if (string.Equals(key, "Path", StringComparison.OrdinalIgnoreCase) && startInfo.Environment.TryGetValue(key, out var existing))
startInfo.Environment[key] = existing + ";" + value;
else
startInfo.Environment[key] = value;
}

// Preserve dynamic process-only variables not stored in registry
// (e.g. TEMP, USERNAME, COMPUTERNAME, PROCESSOR_*)
var proc = Environment.GetEnvironmentVariables(EnvironmentVariableTarget.Process);
foreach (System.Collections.DictionaryEntry kv in proc)
{
var key = kv.Key.ToString();
if (!startInfo.Environment.ContainsKey(key))
startInfo.Environment[key] = kv.Value?.ToString() ?? "";
}
}

public void OpenInFileManager(string path)
{
if (File.Exists(path))
Expand Down