From 46d40fec678c7ab3c1cd6743e675aa13b6d6af77 Mon Sep 17 00:00:00 2001 From: celeron533 Date: Sun, 19 Nov 2017 13:57:27 +0800 Subject: [PATCH] Add the UserRule at the beginning of PAC file --- shadowsocks-csharp/Controller/ShadowsocksController.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shadowsocks-csharp/Controller/ShadowsocksController.cs b/shadowsocks-csharp/Controller/ShadowsocksController.cs index c241bb18..89d4351c 100644 --- a/shadowsocks-csharp/Controller/ShadowsocksController.cs +++ b/shadowsocks-csharp/Controller/ShadowsocksController.cs @@ -618,7 +618,7 @@ namespace Shadowsocks.Controller UpdatePACFromGFWList(); return; } - List lines = GFWListUpdater.ParseResult(FileManager.NonExclusiveReadAllText(Utils.GetTempPath("gfwlist.txt"))); + List lines = new List(); if (File.Exists(PACServer.USER_RULE_FILE)) { string local = FileManager.NonExclusiveReadAllText(PACServer.USER_RULE_FILE, Encoding.UTF8); @@ -632,6 +632,7 @@ namespace Shadowsocks.Controller } } } + lines.AddRange(GFWListUpdater.ParseResult(FileManager.NonExclusiveReadAllText(Utils.GetTempPath("gfwlist.txt")))); string abpContent; if (File.Exists(PACServer.USER_ABP_FILE)) {