Remember all UI state even for empty windows (fixes #207) (#28580)

microsoft · Jun 13, 2017 · 03bb0ad · 03bb0ad
1 parent 60a0695
commit 03bb0ad
Show file tree

Hide file tree

Showing 29 changed files with 416 additions and 209 deletions.
diff --git a/src/vs/code/electron-main/launch.ts b/src/vs/code/electron-main/launch.ts
@@ -114,7 +114,7 @@ export class LaunchService implements ILaunchService {
 
 		// If the other instance is waiting to be killed, we hook up a window listener if one window
 		// is being used and only then resolve the startup promise which will kill this second instance
-		if (args.wait && usedWindows && usedWindows.length === 1 && usedWindows[0]) {
+		if (args.wait && usedWindows.length === 1 && usedWindows[0]) {
 			const windowId = usedWindows[0].id;
 
 			return new TPromise<void>((c, e) => {

diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts
@@ -448,7 +448,7 @@ export class CodeMenu {
 		return new MenuItem(this.likeAction(commandId, {
 			label: this.unmnemonicLabel(tildify(path, this.environmentService.userHome)), click: (menuItem, win, event) => {
 				const openInNewWindow = this.isOptionClick(event);
-				const success = !!this.windowsService.open({ context: OpenContext.MENU, cli: this.environmentService.args, pathsToOpen: [path], forceNewWindow: openInNewWindow });
+				const success = this.windowsService.open({ context: OpenContext.MENU, cli: this.environmentService.args, pathsToOpen: [path], forceNewWindow: openInNewWindow }).length > 0;
 				if (!success) {
 					this.historyService.removeFromRecentPathsList(path);
 				}

diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
@@ -271,11 +271,15 @@ export class CodeWindow implements ICodeWindow {
 	}
 
 	public get openedWorkspacePath(): string {
-		return this.currentConfig.workspacePath;
+		return this.currentConfig ? this.currentConfig.workspacePath : void 0;
+	}
+
+	public get backupPath(): string {
+		return this.currentConfig ? this.currentConfig.backupPath : void 0;
 	}
 
 	public get openedFilePath(): string {
-		return this.currentConfig.filesToOpen && this.currentConfig.filesToOpen[0] && this.currentConfig.filesToOpen[0].filePath;
+		return this.currentConfig && this.currentConfig.filesToOpen && this.currentConfig.filesToOpen[0] && this.currentConfig.filesToOpen[0].filePath;
 	}
 
 	public setReady(): void {