From 3f2ee3abe5d6420e44bbf00519ceda4d9d4fb2cc Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 4 Mar 2016 01:27:03 +0100 Subject: [PATCH] debug: set noDebug only aftere null check --- src/vs/workbench/parts/debug/electron-browser/debugService.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts index 439ae0dcf14..9a0a265e088 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts @@ -512,7 +512,6 @@ export class DebugService extends ee.EventEmitter implements debug.IDebugService return this.textFileService.saveAll().then(() => this.extensionService.onReady()).then(() => this.configurationManager.setConfiguration(this.configurationManager.getConfigurationName())).then(() => { const configuration = this.configurationManager.getConfiguration(); - configuration.noDebug = noDebug; if (!configuration) { return this.configurationManager.openConfigFile(false).then(openend => { if (openend) { @@ -520,6 +519,8 @@ export class DebugService extends ee.EventEmitter implements debug.IDebugService } }); } + + configuration.noDebug = noDebug; if (!this.configurationManager.getAdapter()) { this.emit(debug.ServiceEvents.TYPE_NOT_SUPPORTED, configuration.type); return configuration.type ? TPromise.wrapError(new Error(nls.localize('debugTypeNotSupported', "Configured debug type '{0}' is not supported.", configuration.type)))