From aa8f889b8a127dcafe6d63a5e7ea97f9380a9def Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 12 May 2017 12:42:34 +0200
Subject: [PATCH] fix #26512

---
 src/vs/code/electron-main/app.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 03609bc5772..f15971a75de 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -113,11 +113,15 @@ export class VSCodeApplication {
 		});
 
 		ipc.on('vscode:fetchShellEnv', (event, windowId) => {
-			const win = BrowserWindow.fromId(windowId);
+			const { webContents } = BrowserWindow.fromId(windowId);
 			getShellEnvironment().then(shellEnv => {
-				win.webContents.send('vscode:acceptShellEnv', shellEnv);
+				if (!webContents.isDestroyed()) {
+					webContents.send('vscode:acceptShellEnv', shellEnv);
+				}
 			}, err => {
-				win.webContents.send('vscode:acceptShellEnv', {});
+				if (!webContents.isDestroyed()) {
+					webContents.send('vscode:acceptShellEnv', {});
+				}
 				console.error('Error fetching shell env', err);
 			});
 		});
@@ -265,4 +269,4 @@ export class VSCodeApplication {
 	private dispose(): void {
 		this.toDispose = dispose(this.toDispose);
 	}
-}
\ No newline at end of file
+}