Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 12:04:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set Electron session's proxy from user setting (fixes #94148)

Browse Source
This commit is contained in:
Christof Marti
2020-04-08 10:43:37 +02:00
parent d5e12a12dd
commit 1e960d5abb
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/code/electron-main/window.ts
View File

@@ -118,6 +118,8 @@ export class CodeWindow extends Disposable implements ICodeWindow {
private readonly touchBarGroups: TouchBarSegmentedControl[];
private currentHttpProxy?: string;
constructor(
config: IWindowCreationOptions,
@ILogService private readonly logService: ILogService,
@@ -594,6 +596,16 @@ export class CodeWindow extends Disposable implements ICodeWindow {
this.currentMenuBarVisibility = newMenuBarVisibility;
this.setMenuBarVisibility(newMenuBarVisibility);
}
// Do not set to empty configuration at startup if setting is empty to not override configuration through CLI options:
const newHttpProxy = (this.configurationService.getValue<string>('http.proxy') || '').trim() || undefined;
if (newHttpProxy !== this.currentHttpProxy) {
this.currentHttpProxy = newHttpProxy;
this._win.webContents.session.setProxy({
proxyRules: newHttpProxy || '',
proxyBypassRules: '',
pacScript: '',
});
}
}
addTabbedWindow(window: ICodeWindow): void {