From 11514dbf0230976e4f83b4424fbbd66e7bacd937 Mon Sep 17 00:00:00 2001 From: Student Main Date: Sun, 22 Dec 2019 11:01:30 +0800 Subject: [PATCH] let PACServer running when proxy disabled revert fb4f7ea2eb351208a635f1e1c51ba212f2ccc822 --- shadowsocks-csharp/Controller/ShadowsocksController.cs | 1 + shadowsocks-csharp/Controller/System/SystemProxy.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/shadowsocks-csharp/Controller/ShadowsocksController.cs b/shadowsocks-csharp/Controller/ShadowsocksController.cs index 52c5235b..4faf95d4 100644 --- a/shadowsocks-csharp/Controller/ShadowsocksController.cs +++ b/shadowsocks-csharp/Controller/ShadowsocksController.cs @@ -483,6 +483,7 @@ namespace Shadowsocks.Controller _pacDaemon.PACFileChanged += PacDaemon_PACFileChanged; _pacDaemon.UserRuleFileChanged += PacDaemon_UserRuleFileChanged; _pacServer = _pacServer ?? new PACServer(_pacDaemon); + _pacServer.UpdatePACURL(_config); // So PACServer works when system proxy disabled. gfwListUpdater = gfwListUpdater ?? new GFWListUpdater(); gfwListUpdater.UpdateCompleted += PacServer_PACUpdateCompleted; diff --git a/shadowsocks-csharp/Controller/System/SystemProxy.cs b/shadowsocks-csharp/Controller/System/SystemProxy.cs index e11342ab..fa7d6853 100644 --- a/shadowsocks-csharp/Controller/System/SystemProxy.cs +++ b/shadowsocks-csharp/Controller/System/SystemProxy.cs @@ -39,7 +39,7 @@ namespace Shadowsocks.Controller } else { - pacSrv.UpdatePACURL(config); + pacUrl = pacSrv.PacUrl; } Sysproxy.SetIEProxy(true, false, null, pacUrl);