diff --git a/v2rayN/v2rayN/Handler/UpdateHandle.cs b/v2rayN/v2rayN/Handler/UpdateHandle.cs index 7914c2d3..12f11e73 100644 --- a/v2rayN/v2rayN/Handler/UpdateHandle.cs +++ b/v2rayN/v2rayN/Handler/UpdateHandle.cs @@ -175,24 +175,20 @@ namespace v2rayN.Handler foreach (var item in subItem) { - if (item.enabled == false) - { - continue; - } - if (!Utils.IsNullOrEmpty(subId) && item.id != subId) - { - continue; - } - string id = item.id.TrimEx(); string url = item.url.TrimEx(); string userAgent = item.userAgent.TrimEx(); string hashCode = $"{item.remarks}->"; - if (Utils.IsNullOrEmpty(id) || Utils.IsNullOrEmpty(url)) + if (Utils.IsNullOrEmpty(id) || Utils.IsNullOrEmpty(url) || (!Utils.IsNullOrEmpty(subId) && item.id != subId)) { //_updateFunc(false, $"{hashCode}{ResUI.MsgNoValidSubscription}"); continue; } + if (item.enabled == false) + { + _updateFunc(false, $"{hashCode}{ResUI.MsgSkipSubscriptionUpdate}"); + continue; + } var downloadHandle = new DownloadHandle(); downloadHandle.Error += (sender2, args) => diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs index 3a75470b..15d4d750 100644 --- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs +++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs @@ -1446,6 +1446,15 @@ namespace v2rayN.Resx { } } + /// + /// 查找类似 Updates are not enabled, skip this subscription 的本地化字符串。 + /// + public static string MsgSkipSubscriptionUpdate { + get { + return ResourceManager.GetString("MsgSkipSubscriptionUpdate", resourceCulture); + } + } + /// /// 查找类似 Start getting subscriptions 的本地化字符串。 /// diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx index db619ede..7d96f263 100644 --- a/v2rayN/v2rayN/Resx/ResUI.resx +++ b/v2rayN/v2rayN/Resx/ResUI.resx @@ -1150,4 +1150,7 @@ Please turn off when there is an abnormal disconnection + + Updates are not enabled, skip this subscription + \ No newline at end of file diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx index fe04f96f..3ff8647c 100644 --- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx +++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx @@ -1150,4 +1150,7 @@ 当有异常断流时请关闭 + + 未启用更新,跳过此订阅 + \ No newline at end of file