From 4b7a1a3b135f72bb69bd9485b5e1775e4d24dfcd Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Mon, 7 Nov 2016 14:49:32 -0800 Subject: [PATCH] Prevent exception when closing empty workspaces Fixes #15130 --- src/vs/code/electron-main/lifecycle.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/vs/code/electron-main/lifecycle.ts b/src/vs/code/electron-main/lifecycle.ts index b2ce7ca14e3..eb3f0e82678 100644 --- a/src/vs/code/electron-main/lifecycle.ts +++ b/src/vs/code/electron-main/lifecycle.ts @@ -140,9 +140,11 @@ export class LifecycleService implements ILifecycleService { this.unload(vscodeWindow).done(veto => { if (!veto) { // Clear out any workspace backups from workspaces.json that don't have any backups - const workspaceResource = Uri.file(vscodeWindow.openedWorkspacePath); - if (!this.backupService.doesWorkspaceHaveBackups(workspaceResource)) { - this.backupService.removeWorkspaceBackupPathSync(workspaceResource); + if (vscodeWindow.openedWorkspacePath) { + const workspaceResource = Uri.file(vscodeWindow.openedWorkspacePath); + if (!this.backupService.doesWorkspaceHaveBackups(workspaceResource)) { + this.backupService.removeWorkspaceBackupPathSync(workspaceResource); + } } this.windowToCloseRequest[windowId] = true;