From 72ba45249e364723386eeec298f84e35ff98373e Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 24 Mar 2017 13:45:03 -0700 Subject: [PATCH] fix npes --- src/vs/workbench/browser/parts/editor/editorStatus.ts | 2 +- src/vs/workbench/common/editor/editorStacksModel.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts index 3ecc3c3d83c..ef22157855c 100644 --- a/src/vs/workbench/browser/parts/editor/editorStatus.ts +++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts @@ -661,7 +661,7 @@ export class EditorStatus implements IStatusbarItem { const activeEditor = this.editorService.getActiveEditor(); if (activeEditor) { const activeResource = toResource(activeEditor.input, { supportSideBySide: true, filter: ['file', 'untitled'] }); - if (activeResource.toString() === resource.toString()) { + if (activeResource && activeResource.toString() === resource.toString()) { return this.onEncodingChange(activeEditor); // only update if the encoding changed for the active resource } } diff --git a/src/vs/workbench/common/editor/editorStacksModel.ts b/src/vs/workbench/common/editor/editorStacksModel.ts index cf35c2c5f9a..4af83be2a24 100644 --- a/src/vs/workbench/common/editor/editorStacksModel.ts +++ b/src/vs/workbench/common/editor/editorStacksModel.ts @@ -198,7 +198,7 @@ export class EditorGroup implements IEditorGroup { for (let i = 0; i < this.editors.length; i++) { const editor = this.editors[i]; const editorResource = toResource(editor, { supportSideBySide: true }); - if (editorResource.toString() === resource.toString()) { + if (editorResource && editorResource.toString() === resource.toString()) { return editor; } } -- GitLab