From 4516abbdf1300a4a8ffb44d69eb5a8acd7e2030e Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Wed, 17 Apr 2019 11:07:33 -0700 Subject: [PATCH] Fix terminal launch issue --- src/vs/workbench/api/node/extHostTerminalService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts index 2c582a08487..daf59b402e8 100644 --- a/src/vs/workbench/api/node/extHostTerminalService.ts +++ b/src/vs/workbench/api/node/extHostTerminalService.ts @@ -447,6 +447,7 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape { // Merge in shell and args from settings const platformKey = platform.isWindows ? 'windows' : (platform.isMacintosh ? 'osx' : 'linux'); + const configProvider = await this._extHostConfiguration.getConfigProvider(); if (!shellLaunchConfig.executable) { const fetchSetting = (key: string) => { const setting = configProvider @@ -462,7 +463,6 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape { } // Get the initial cwd - const configProvider = await this._extHostConfiguration.getConfigProvider(); const terminalConfig = configProvider.getConfiguration('terminal.integrated'); const activeWorkspaceRootUri = URI.revive(activeWorkspaceRootUriComponents); const initialCwd = terminalEnvironment.getCwd(shellLaunchConfig, os.homedir(), activeWorkspaceRootUri, terminalConfig.cwd); -- GitLab