Skip to content

Commit

Permalink
Merge pull request #2079 from microsoft/develop
Browse files Browse the repository at this point in the history
Merge develop -> main
  • Loading branch information
bobbrow authored Aug 26, 2021
2 parents 2c24173 + 5a7db44 commit 9edbdd5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/cmake-tools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@ export class CMakeTools implements vscode.Disposable, api.CMakeToolsAPI {
// Add environment variables from configurePreset.
if (this.configurePreset?.environment) {
const configure_preset_environment = await drv.getConfigureEnvironment();
debug_config.environment = debug_config.environment ? debug_config.environment.concat(util.splitEnvironmentVars(configure_preset_environment)) : {};
debug_config.environment = debug_config.environment ? debug_config.environment.concat(util.splitEnvironmentVars(configure_preset_environment)) : [];
}

log.debug(localize('starting.debugger.with', 'Starting debugger with following configuration.'), JSON.stringify({
Expand Down

0 comments on commit 9edbdd5

Please sign in to comment.