diff --git a/v2rayN/v2rayN/Handler/DownloadHandle.cs b/v2rayN/v2rayN/Handler/DownloadHandle.cs index 663d5b5a..66ef31ba 100644 --- a/v2rayN/v2rayN/Handler/DownloadHandle.cs +++ b/v2rayN/v2rayN/Handler/DownloadHandle.cs @@ -4,7 +4,6 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Net.Sockets; -using System.Threading; using v2rayN.Base; using v2rayN.Resx; diff --git a/v2rayN/v2rayN/Handler/SysProxyHandle.cs b/v2rayN/v2rayN/Handler/SysProxyHandle.cs index aa99a4cd..44a25aec 100644 --- a/v2rayN/v2rayN/Handler/SysProxyHandle.cs +++ b/v2rayN/v2rayN/Handler/SysProxyHandle.cs @@ -79,10 +79,12 @@ namespace v2rayN.Handler .Replace("{http_port}", port.ToString()) .Replace("{socks_port}", portSocks.ToString()); } + ProxySetting.SetProxy(strProxy, strExceptions, 2); SetIEProxy(true, strProxy, strExceptions); } else if (type == ESysProxyType.ForcedClear) { + ProxySetting.UnsetProxy(); ResetIEProxy(); } else if (type == ESysProxyType.Unchanged) @@ -92,6 +94,7 @@ namespace v2rayN.Handler { PacHandler.Start(Utils.GetConfigPath(), port, portPac); var strProxy = $"{Global.httpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}"; + ProxySetting.SetProxy(strProxy, "", 4); SetIEProxy(false, strProxy, ""); } @@ -129,22 +132,9 @@ namespace v2rayN.Handler } // set system proxy to 1 (null) (null) (null) - public static bool ResetIEProxy() + public static void ResetIEProxy() { - try - { - // clear user-wininet.json - //_userSettings = new SysproxyConfig(); - //Save(); - // clear system setting - ExecSysproxy("set 1 - - -"); - } - catch (Exception) - { - return false; - } - - return true; + ExecSysproxy("set 1 - - -"); } private static void ExecSysproxy(string arguments) diff --git a/v2rayN/v2rayN/Mode/SingboxConfig.cs b/v2rayN/v2rayN/Mode/SingboxConfig.cs index 0ed7852a..dfcf0f4d 100644 --- a/v2rayN/v2rayN/Mode/SingboxConfig.cs +++ b/v2rayN/v2rayN/Mode/SingboxConfig.cs @@ -109,7 +109,7 @@ public List alpn { get; set; } public Utls4Sbox utls { get; set; } public Reality4Sbox reality { get; set; } - } + } public class Multiplex4Sbox { @@ -152,7 +152,7 @@ public string strategy { get; set; } public string detour { get; set; } } - + public class Experimental4Sbox { public V2ray_Api4Sbox v2ray_api { get; set; } diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml index d02780f4..becc1e84 100644 --- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml +++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml @@ -693,6 +693,7 @@ Grid.Column="1" Width="300" Margin="{StaticResource SettingItemMargin}" + IsEditable="True" Style="{StaticResource DefComboBox}" />