Cannot read property 'loadURL' of null (fixes #26588)

microsoft · May 15, 2017 · 72c32b2 · 72c32b2
1 parent 4529dd4
commit 72c32b2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
@@ -600,9 +600,6 @@ export class VSCodeWindow {
 	}
 
 	public serializeWindowState(): IWindowState {
-		if (!this._win) {
-			return null; // avoid NPE when calling this method after the window has been disposed
-		}
 
 		// fullscreen gets special treatment
 		if (this._win.isFullScreen()) {

diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
@@ -1204,6 +1204,10 @@ export class WindowsManager implements IWindowsMainService {
 				detail: nls.localize('appStalledDetail', "You can reopen or close the window or keep waiting."),
 				noLink: true
 			}, result => {
+				if (!vscodeWindow.win) {
+					return; // Return early if the window has been going down already
+				}
+
 				if (result === 0) {
 					vscodeWindow.reload();
 				} else if (result === 2) {
@@ -1223,6 +1227,10 @@ export class WindowsManager implements IWindowsMainService {
 				detail: nls.localize('appCrashedDetail', "We are sorry for the inconvenience! You can reopen the window to continue where you left off."),
 				noLink: true
 			}, result => {
+				if (!vscodeWindow.win) {
+					return; // Return early if the window has been going down already
+				}
+
 				if (result === 0) {
 					vscodeWindow.reload();
 				} else if (result === 1) {