diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.cs
index f5d87e23..1d4394a8 100644
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.cs
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.cs
@@ -373,7 +373,7 @@ namespace v2rayN.Forms
private int SaveUserPAC()
{
string userPacRule = txtuserPacRule.Text.TrimEx();
- userPacRule = userPacRule.Replace("\"", "");
+ userPacRule = userPacRule.Replace("\"", "").Replace("'", "");
config.userPacRule = Utils.String2List(userPacRule);
diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
index b45cc3c5..293a96d7 100644
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
@@ -282,7 +282,7 @@
协议
- *设置用户PAC规则,用逗号(,)隔开
+ *用户PAC内的自定条目。用逗号(,)或换行隔开的匹配模式(pattern)。英文单引号、双引号将被忽略。
53, 12
diff --git a/v2rayN/v2rayN/Tool/Utils.cs b/v2rayN/v2rayN/Tool/Utils.cs
index 09c023de..06dc979b 100644
--- a/v2rayN/v2rayN/Tool/Utils.cs
+++ b/v2rayN/v2rayN/Tool/Utils.cs
@@ -168,7 +168,7 @@ namespace v2rayN
}
}
///
- /// 逗号分隔的字符串,转List
+ /// 换行或逗号分隔的字符串,转List
///
///
///
@@ -176,7 +176,7 @@ namespace v2rayN
{
try
{
- str = str.Replace(Environment.NewLine, "");
+ str = str.Replace("\r", ",").Replace("\n", ","); // 用户复制的可能是\r、\n或\r\n
return new List(str.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries));
}
catch