Fix workspace folder settings being incorrect. (#5135)

Author: sean-mcmanus

Extension/src/LanguageServer/client.ts

@@ -1072,13 +1072,14 @@ export class DefaultClient implements Client {
             let settings: CppSettings[] = [];
             let otherSettings: OtherSettings[] = [];
 
-            settings.push(workspaceSettings);
-            otherSettings.push(workspaceOtherSettings);
             if (vscode.workspace.workspaceFolders) {
                 for (let workspaceFolder of vscode.workspace.workspaceFolders) {
                     settings.push(new CppSettings(workspaceFolder.uri));
                     otherSettings.push(new OtherSettings(workspaceFolder.uri));
                 }
+            } else {
+                settings.push(workspaceSettings);
+                otherSettings.push(workspaceOtherSettings);
             }
 
             for (let setting of settings) {