From f3ffc2ed9b0318f236201aa2c0447eec242f4738 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 13 Apr 2017 15:35:10 +0200
Subject: [PATCH] fix #24435

---
 src/vs/workbench/electron-browser/bootstrap/index.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vs/workbench/electron-browser/bootstrap/index.js b/src/vs/workbench/electron-browser/bootstrap/index.js
index f2ebeed20cf..f320447cd9a 100644
--- a/src/vs/workbench/electron-browser/bootstrap/index.js
+++ b/src/vs/workbench/electron-browser/bootstrap/index.js
@@ -20,7 +20,12 @@ const remote = electron.remote;
 const ipc = electron.ipcRenderer;
 
 process.lazyEnv = new Promise(function (resolve) {
+	const handle = setTimeout(function () {
+		resolve();
+		console.warn('renderer did not receive lazyEnv in time')
+	}, 2000);
 	ipc.once('vscode:acceptShellEnv', function (event, shellEnv) {
+		clearTimeout(handle);
 		assign(process.env, shellEnv);
 		resolve(process.env);
 	});
-- 
GitLab