mirror of
https://github.com/Microsoft/vscode
synced 2024-09-18 01:58:27 +00:00
parent
13d3c0e757
commit
24faa3733f
|
@ -64,6 +64,13 @@ export abstract class BaseTerminalProfileResolverService implements ITerminalPro
|
|||
}
|
||||
shellLaunchConfig.executable = resolvedProfile.path;
|
||||
shellLaunchConfig.args = resolvedProfile.args;
|
||||
if (resolvedProfile.env) {
|
||||
if (shellLaunchConfig.env) {
|
||||
shellLaunchConfig.env = { ...shellLaunchConfig.env, ...resolvedProfile.env };
|
||||
} else {
|
||||
shellLaunchConfig.env = resolvedProfile.env;
|
||||
}
|
||||
}
|
||||
|
||||
// Verify the icon is valid, and fallback correctly to the generic terminal id if there is
|
||||
// an issue
|
||||
|
|
Loading…
Reference in a new issue