fixes #42626

microsoft · Jan 31, 2018 · 254d9c8 · 254d9c8
1 parent d2253a2
commit 254d9c8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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
 		}