From bf73e0c8582af2cbe3eaf2e57003be0213271250 Mon Sep 17 00:00:00 2001 From: DHR60 Date: Tue, 29 Jul 2025 09:24:32 +0800 Subject: [PATCH] Fixes --- v2rayN/ServiceLib/Handler/AppHandler.cs | 2 +- v2rayN/ServiceLib/Handler/CoreConfigHandler.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/v2rayN/ServiceLib/Handler/AppHandler.cs b/v2rayN/ServiceLib/Handler/AppHandler.cs index 1422ad73..699162a5 100644 --- a/v2rayN/ServiceLib/Handler/AppHandler.cs +++ b/v2rayN/ServiceLib/Handler/AppHandler.cs @@ -256,7 +256,7 @@ public sealed class AppHandler var coreType = GetCoreType(profileItem, profileItem.ConfigType); ECoreType? preCoreType = null; - var pureEndpointCore = GetSplitCoreType(profileItem, profileItem.ConfigType); + var pureEndpointCore = profileItem.CoreType ?? GetSplitCoreType(profileItem, profileItem.ConfigType); var splitRouteCore = _config.SplitCoreItem.RouteCoreType; var enableTun = _config.TunModeItem.EnableTun; diff --git a/v2rayN/ServiceLib/Handler/CoreConfigHandler.cs b/v2rayN/ServiceLib/Handler/CoreConfigHandler.cs index f2d38bfc..41005efe 100644 --- a/v2rayN/ServiceLib/Handler/CoreConfigHandler.cs +++ b/v2rayN/ServiceLib/Handler/CoreConfigHandler.cs @@ -23,11 +23,11 @@ public class CoreConfigHandler _ => await GenerateClientCustomConfig(node, fileName) }; } - else if (AppHandler.Instance.GetCoreType(node, node.ConfigType) == ECoreType.sing_box) + else if (AppHandler.Instance.GetCoreType(node, node.ConfigType) == ECoreType.sing_box || (Global.SingboxSupportConfigType.Contains(node.ConfigType) && !Global.XraySupportConfigType.Contains(node.ConfigType))) { result = await new CoreConfigSingboxService(config).GenerateClientConfigContent(node); } - else if (AppHandler.Instance.GetCoreType(node, node.ConfigType) == ECoreType.Xray) + else if (Global.XraySupportConfigType.Contains(node.ConfigType)) { result = await new CoreConfigV2rayService(config).GenerateClientConfigContent(node); } @@ -159,7 +159,7 @@ public class CoreConfigHandler { result = await new CoreConfigSingboxService(config).GenerateClientSpeedtestConfig(node, port); } - else + else if (Global.XraySupportConfigType.Contains(node.ConfigType)) { result = await new CoreConfigV2rayService(config).GenerateClientSpeedtestConfig(node, port); } @@ -179,7 +179,7 @@ public class CoreConfigHandler { result = await new CoreConfigSingboxService(config).GenerateClientMultipleLoadConfig(selecteds); } - else + else if (coreType == ECoreType.Xray) { result = await new CoreConfigV2rayService(config).GenerateClientMultipleLoadConfig(selecteds, multipleLoad); }