propagate VSCODE_IPC_HOOK to renderer

microsoft · Apr 7, 2016 · 4849118 · 4849118
1 parent b5654a9
commit 4849118
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/vs/workbench/electron-browser/index.html b/src/vs/workbench/electron-browser/index.html
@@ -108,7 +108,10 @@
 			var configuration = JSON.parse(args['config']);
 			var enableDeveloperTools = !configuration.isBuilt || !!configuration.extensionDevelopmentPath;
 
+			// Linux is a PAIN https://github.com/electron/electron/issues/3306
+			process.env['VSCODE_IPC_HOOK'] = configuration.mainIPCHandle;
 			process.env['VSCODE_SHARED_IPC_HOOK'] = configuration.sharedIPCHandle;
+
 			// Get the nls configuration into the process.env as early as possible.
 			if (configuration.userEnv && configuration.userEnv['VSCODE_NLS_CONFIG']) {
 				process.env['VSCODE_NLS_CONFIG'] = configuration.userEnv['VSCODE_NLS_CONFIG'];

diff --git a/src/vs/workbench/electron-main/window.ts b/src/vs/workbench/electron-main/window.ts
@@ -97,6 +97,7 @@ export interface IWindowConfiguration extends env.ICommandLineArguments {
 	appSettingsPath: string;
 	appKeybindingsPath: string;
 	userExtensionsHome: string;
+	mainIPCHandle: string;
 	sharedIPCHandle: string;
 	appRoot: string;
 	isBuilt: boolean;

diff --git a/src/vs/workbench/electron-main/windows.ts b/src/vs/workbench/electron-main/windows.ts
@@ -151,7 +151,7 @@ export class WindowsManager {
 
 		ipc.on('vscode:startCrashReporter', (event: any, config: any) => {
 			env.log('IPC#vscode:startCrashReporter');
-			
+
 			crashReporter.start(config);
 		});
 
@@ -685,6 +685,7 @@ export class WindowsManager {
 		configuration.appKeybindingsPath = env.appKeybindingsPath;
 		configuration.userExtensionsHome = env.userExtensionsHome;
 		configuration.extensionTips = env.product.extensionTips;
+		configuration.mainIPCHandle = env.mainIPCHandle;
 		configuration.sharedIPCHandle = env.sharedIPCHandle;
 		configuration.isBuilt = env.isBuilt;
 		configuration.crashReporter = env.product.crashReporter;