From ffc47ca36d5dbaacbb78ead8f983addbbe80367f Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 5 Feb 2016 10:40:50 +0100 Subject: [PATCH] outputServices: null guard --- src/vs/workbench/parts/output/common/outputServices.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/output/common/outputServices.ts b/src/vs/workbench/parts/output/common/outputServices.ts index 4961fdd9b2c..2e4c30eb976 100644 --- a/src/vs/workbench/parts/output/common/outputServices.ts +++ b/src/vs/workbench/parts/output/common/outputServices.ts @@ -167,7 +167,7 @@ export class OutputService implements IOutputService { this.storageService.store(OUTPUT_ACTIVE_CHANNEL_KEY, this.activeChannel, StorageScope.WORKSPACE); return this.panelService.openPanel(OUTPUT_PANEL_ID, !preserveFocus).then((outputPanel: OutputPanel) => { - return outputPanel.setInput(OutputEditorInput.getInstance(this.instantiationService, channel), EditorOptions.create({ preserveFocus: preserveFocus })). + return outputPanel && outputPanel.setInput(OutputEditorInput.getInstance(this.instantiationService, channel), EditorOptions.create({ preserveFocus: preserveFocus })). then(() => outputPanel); }); }