From a6289347cc520bd32676076f8e1e347bc55581da Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Mon, 11 Nov 2024 09:37:49 +0800 Subject: [PATCH 1/2] Bug fix https://github.com/2dust/v2rayN/issues/6037 --- v2rayN/ServiceLib/Handler/CoreInfoHandler.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/v2rayN/ServiceLib/Handler/CoreInfoHandler.cs b/v2rayN/ServiceLib/Handler/CoreInfoHandler.cs index 5f5656ee..346aa957 100644 --- a/v2rayN/ServiceLib/Handler/CoreInfoHandler.cs +++ b/v2rayN/ServiceLib/Handler/CoreInfoHandler.cs @@ -1,6 +1,4 @@ -using System.Runtime.Intrinsics.X86; - -namespace ServiceLib.Handler +namespace ServiceLib.Handler { public sealed class CoreInfoHandler { @@ -89,7 +87,7 @@ namespace ServiceLib.Handler _coreInfo.Add(new CoreInfo { CoreType = ECoreType.mihomo, - CoreExes = new List { $"mihomo-windows-amd64{(Avx2.X64.IsSupported ? "" : "-compatible")}", "mihomo-windows-amd64-compatible", "mihomo-windows-amd64", "mihomo-windows-386", "mihomo", "clash" }, + CoreExes = new List { "mihomo-windows-amd64-compatible", "mihomo-windows-amd64", "mihomo-linux-amd64", "mihomo", "clash" }, Arguments = "-f config.json" + PortableMode(), Url = Global.MihomoCoreUrl, ReleaseApiUrl = Global.MihomoCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl), @@ -105,7 +103,7 @@ namespace ServiceLib.Handler _coreInfo.Add(new CoreInfo { CoreType = ECoreType.hysteria, - CoreExes = new List { "hysteria-windows-amd64", "hysteria-windows-386", "hysteria" }, + CoreExes = new List { "hysteria-windows-amd64", "hysteria" }, Arguments = "", Url = Global.HysteriaCoreUrl, ReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl), @@ -157,7 +155,7 @@ namespace ServiceLib.Handler _coreInfo.Add(new CoreInfo { CoreType = ECoreType.hysteria2, - CoreExes = new List { "hysteria-windows-amd64", "hysteria-windows-386", "hysteria" }, + CoreExes = new List { "hysteria-windows-amd64", "hysteria-linux-amd64", "hysteria" }, Arguments = "", Url = Global.HysteriaCoreUrl, ReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl), From 61e9101851ae8b32f1977a4077157f24c26e888c Mon Sep 17 00:00:00 2001 From: fonaix Date: Mon, 11 Nov 2024 09:48:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9AMacOS=20?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=AD=98=E5=82=A8=E6=89=80=E5=9C=A8=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E5=8A=9F=E8=83=BD=20(#6038)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 添加:MacOS 代理配置与清除 * 修复:点击表头排序时,超时服务器排在前面的问题 * 添加:MacOS 打开存储所在位置功能 * 修复:删除全部节点时,UI不更新的问题 --- v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs | 4 ++++ v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs index f66928ad..9660945e 100644 --- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs +++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs @@ -532,6 +532,10 @@ namespace ServiceLib.ViewModels { Utils.ProcessStart("nautilus", Utils.GetConfigPath()); } + else if (Utils.IsOSX()) + { + Utils.ProcessStart("open", Utils.GetConfigPath()); + } } #endregion Setting diff --git a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs index 507fff0e..d3ca25e8 100644 --- a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs +++ b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs @@ -479,7 +479,10 @@ namespace ServiceLib.ViewModels await ConfigHandler.RemoveServer(_config, lstSelecteds); NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess); - + if (lstSelecteds.Count == _profileItems.Count) + { + _profileItems.Clear(); + } RefreshServers(); if (exists) {