没有启用加速也可开启加速单独启用脚本

BeyondDimension · May 3, 2021 · 0f730aa · 0f730aa
1 parent c51e85f
commit 0f730aa
Showing 1 changed file with 26 additions and 22 deletions.
diff --git a/src/ST.Client.Desktop/Services/Mvvm/ProxyService.cs b/src/ST.Client.Desktop/Services/Mvvm/ProxyService.cs
@@ -132,31 +132,19 @@ public bool ProxyStatus
                 {
                     if (value)
                     {
-                        if (!EnableProxyDomains.Any_Nullable())
+                        if (EnableProxyDomains.Any_Nullable())
                         {
-                            Toast.Show(AppResources.CommunityFix_NoSelectAcceleration);
-                            return;
+                            //Toast.Show(AppResources.CommunityFix_NoSelectAcceleration);
+                            //return;
+                            httpProxyService.ProxyDomains = EnableProxyDomains;
+                            this.RaisePropertyChanged(nameof(EnableProxyDomains));
                         }
                         httpProxyService.ProxyDomains = EnableProxyDomains;
                         httpProxyService.Scripts = EnableProxyScripts;
                         httpProxyService.IsEnableScript = ProxySettings.IsEnableScript.Value;
                         httpProxyService.IsOnlyWorkSteamBrowser = ProxySettings.IsOnlyWorkSteamBrowser.Value;
-                        this.RaisePropertyChanged(nameof(EnableProxyDomains));
                         this.RaisePropertyChanged(nameof(EnableProxyScripts));
 
-                        var hosts = httpProxyService.ProxyDomains.SelectMany(s =>
-                        {
-                            return s?.HostsArray.Select(host =>
-                            {
-                                if (host.Contains(" "))
-                                {
-                                    var h = host.Split(' ');
-                                    return (h[0], h[1]);
-                                }
-                                return (IPAddress.Loopback.ToString(), host);
-                            });
-                        }).Where(w => !string.IsNullOrEmpty(w.Item1));
-
                         if (!ProxySettings.EnableWindowsProxy.Value)
                         {
                             if (httpProxyService.PortInUse(443))
@@ -172,12 +160,28 @@ public bool ProxyStatus
                         {
                             if (!ProxySettings.EnableWindowsProxy.Value)
                             {
-                                var r = IHostsFileService.Instance.UpdateHosts(hosts);
-                                if (r.ResultType != OperationResultType.Success)
+                                if (httpProxyService.ProxyDomains.Any_Nullable())
                                 {
-                                    Toast.Show(SR.OperationHostsError_.Format(r.Message));
-                                    httpProxyService.StopProxy();
-                                    return;
+                                    var hosts = httpProxyService.ProxyDomains.SelectMany(s =>
+                                    {
+                                        return s?.HostsArray.Select(host =>
+                                        {
+                                            if (host.Contains(" "))
+                                            {
+                                                var h = host.Split(' ');
+                                                return (h[0], h[1]);
+                                            }
+                                            return (IPAddress.Loopback.ToString(), host);
+                                        });
+                                    }).Where(w => !string.IsNullOrEmpty(w.Item1));
+
+                                    var r = IHostsFileService.Instance.UpdateHosts(hosts);
+                                    if (r.ResultType != OperationResultType.Success)
+                                    {
+                                        Toast.Show(SR.OperationHostsError_.Format(r.Message));
+                                        httpProxyService.StopProxy();
+                                        return;
+                                    }
                                 }
                             }
                             StartTiming();