Skip to content

Commit

Permalink
Fix "" compilerPath. (#5393)
Browse files Browse the repository at this point in the history
  • Loading branch information
sean-mcmanus authored May 1, 2020
1 parent b31e464 commit 1b38713
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Extension/src/LanguageServer/configurations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -541,10 +541,10 @@ export class CppProperties {
}

private updateConfigurationString(property: string | undefined | null, defaultValue: string | undefined | null, env: Environment, acceptBlank?: boolean): string | undefined {
if (!property || property === "${default}") {
if (property === null || property === undefined || property === "${default}") {
property = defaultValue;
}
if (!property || (acceptBlank !== true && property === "")) {
if (property === null || property === undefined || (acceptBlank !== true && property === "")) {
return undefined;
}
return util.resolveVariables(property, env);
Expand Down

0 comments on commit 1b38713

Please sign in to comment.