From 254d9c86be267c3c5e58ea1b2e75fbfea436ecc9 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 31 Jan 2018 15:19:21 +0100 Subject: [PATCH] fixes #42626 --- src/vs/workbench/parts/files/common/explorerModel.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/files/common/explorerModel.ts b/src/vs/workbench/parts/files/common/explorerModel.ts index 621a89dba0332..f1d1f94387c47 100644 --- a/src/vs/workbench/parts/files/common/explorerModel.ts +++ b/src/vs/workbench/parts/files/common/explorerModel.ts @@ -153,7 +153,7 @@ export class FileStat implements IFileStat { * exists locally. */ public static mergeLocalWithDisk(disk: FileStat, local: FileStat): void { - if (disk.resource.toString() !== local.resource.toString()) { + if (!disk || !local || disk.resource.toString() !== local.resource.toString()) { return; // Merging only supported for stats with the same resource }