maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix NPE in terminal code

Browse source
This commit is contained in:
Daniel Imms 2016-09-13 15:05:02 -07:00
parent b893f49164
commit 2b5a956ca2
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
View file

@ -216,9 +216,9 @@ export class TerminalInstance implements ITerminalInstance {
return typeof data === 'string' ? data.replace(TerminalInstance.EOL_REGEX, os.EOL) : data;
}
private createProcess(workspace: IWorkspace, name?: string, shell?: IShell) {
private createProcess(workspace: IWorkspace, name: string, shell: IShell) {
let locale = this.configHelper.isSetLocaleVariables() ? platform.locale : undefined;
if (!shell) {
if (!shell.executable) {
shell = this.configHelper.getShell();
}
let env = TerminalInstance.createTerminalEnv(process.env, shell, workspace, locale);
@ -252,9 +252,11 @@ export class TerminalInstance implements ITerminalInstance {
let env = TerminalInstance.cloneEnv(parentEnv);
env['PTYPID'] = process.pid.toString();
env['PTYSHELL'] = shell.executable;
shell.args.forEach((arg, i) => {
env[`PTYSHELLARG${i}`] = arg;
});
if (shell.args) {
shell.args.forEach((arg, i) => {
env[`PTYSHELLARG${i}`] = arg;
});
}
env['PTYCWD'] = TerminalInstance.sanitizeCwd(workspace ? workspace.resource.fsPath : os.homedir());
if (locale) {
env['LANG'] = TerminalInstance.getLangEnvVariable(locale);