From aff393e30278862b207337b3e4d5158c0ffaf78a Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Fri, 6 Jan 2017 17:56:45 +0100
Subject: [PATCH] Fix #18164

---
 .../workbench/parts/preferences/browser/preferencesService.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/preferences/browser/preferencesService.ts b/src/vs/workbench/parts/preferences/browser/preferencesService.ts
index f3e53ff1119..24d871f3a58 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesService.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesService.ts
@@ -125,7 +125,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 	openWorkspaceSettings(): TPromise<void> {
 		if (!this.contextService.hasWorkspace()) {
 			this.messageService.show(Severity.Info, nls.localize('openFolderFirst', "Open a folder first to create workspace settings"));
-			return;
+			return TPromise.as(null);
 		}
 		return this.openSettings(ConfigurationTarget.WORKSPACE);
 	}
-- 
GitLab