Add the UserRule at the beginning of PAC file

2017-11-19 13:57:27 +08:00
parent aacc4edf69
commit 46d40fec67
1 changed files with 2 additions and 1 deletions
@@ -618,7 +618,7 @@ namespace Shadowsocks.Controller
                UpdatePACFromGFWList();
                return;
            }
-            List<string> lines = GFWListUpdater.ParseResult(FileManager.NonExclusiveReadAllText(Utils.GetTempPath("gfwlist.txt")));
+            List<string> lines = new List<string>();
            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))
            {