Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-08-24 11:56:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

修正不改变系统代理时的退出行为

Browse source
This commit is contained in:
lrisora 2021-05-05 20:47:45 +08:00
parent f0c59e38cc
commit 20a03cde93
No known key found for this signature in database
GPG key ID: BFF52AF2FE044FEC
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
v2rayN/v2rayN/Forms/MainForm.cs
View file

@ -36,6 +36,7 @@ namespace v2rayN.Forms
v2rayHandler.V2rayStop(); v2rayHandler.V2rayStop();
//HttpProxyHandle.CloseHttpAgent(config); //HttpProxyHandle.CloseHttpAgent(config);
// 第二个bool参数指示此次UpdateSysProxy是否为退出
HttpProxyHandle.UpdateSysProxy(config, true); HttpProxyHandle.UpdateSysProxy(config, true);
ConfigHandler.SaveConfig(ref config); ConfigHandler.SaveConfig(ref config);

6
v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs
View file

@ -147,11 +147,12 @@ namespace v2rayN.HttpProxyHandler
Update(config, false); Update(config, false);
} }
public static bool UpdateSysProxy(Config config, bool forceDisable) public static bool UpdateSysProxy(Config config, bool isExit)
{ {
var type = config.sysProxyType; var type = config.sysProxyType;
if (forceDisable) // 如果是程序退出那么自动配置系统代理的更新行为应当是清除
if (isExit && type == ESysProxyType.ForcedChange)
{ {
type = ESysProxyType.ForcedClear; type = ESysProxyType.ForcedClear;
} }
@ -170,6 +171,7 @@ namespace v2rayN.HttpProxyHandler
} }
else if (type == ESysProxyType.ForcedClear) else if (type == ESysProxyType.ForcedClear)
{ {
// 系统关机时这里无法复位成功，需要改
SysProxyHandle.ResetIEProxy(); SysProxyHandle.ResetIEProxy();
} }
else if (type == ESysProxyType.Unchanged) else if (type == ESysProxyType.Unchanged)