From db64c5967b01c19a1bd80050a33904f366fea048 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Wed, 15 Apr 2020 14:48:07 +0200
Subject: [PATCH] Fix #95316

---
 .../configuration/browser/configurationService.ts        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/services/configuration/browser/configurationService.ts b/src/vs/workbench/services/configuration/browser/configurationService.ts
index 652eba904de..4d2315b2e2d 100644
--- a/src/vs/workbench/services/configuration/browser/configurationService.ts
+++ b/src/vs/workbench/services/configuration/browser/configurationService.ts
@@ -87,10 +87,11 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
 		}
 		this.workspaceConfiguration = this._register(new WorkspaceConfiguration(configurationCache, fileService));
 		this._register(this.workspaceConfiguration.onDidUpdateConfiguration(() => {
-			this.onWorkspaceConfigurationChanged();
-			if (this.workspaceConfiguration.loaded) {
-				this.releaseWorkspaceBarrier();
-			}
+			this.onWorkspaceConfigurationChanged().then(() => {
+				if (this.workspaceConfiguration.loaded) {
+					this.releaseWorkspaceBarrier();
+				}
+			});
 		}));
 
 		this._register(Registry.as<IConfigurationRegistry>(Extensions.Configuration).onDidSchemaChange(e => this.registerConfigurationSchemas()));