Merge 366daef7c5 into 1090afd774

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -1433,7 +1433,7 @@ public static class ConfigHandler
         else if (node.ConfigType == EConfigType.Custom
             && node.PreSocksPort is > 0 and <= 65535)
         {
-            var preCoreType = config.TunModeItem.EnableTun ? ECoreType.sing_box : ECoreType.Xray;
+            var preCoreType = AppManager.Instance.RunningCoreType = config.TunModeItem.EnableTun ? ECoreType.sing_box : ECoreType.Xray;
             itemSocks = new ProfileItem()
             {
                 CoreType = preCoreType,

v2rayN/ServiceLib/Manager/CoreManager.cs

@@ -90,9 +90,6 @@ public class CoreManager
 
         await CoreStart(mainContext);
         await CoreStartPreService(preContext);
-
-        AppManager.Instance.RunningCoreType = preContext?.RunCoreType ?? mainContext.RunCoreType;
-
         if (_processService != null)
         {
             await UpdateFunc(true, $"{node.GetSummary()}");
@@ -175,7 +172,7 @@ public class CoreManager
     private async Task CoreStart(CoreConfigContext context)
     {
         var node = context.Node;
-        var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
+        var coreType = AppManager.Instance.RunningCoreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
         var coreInfo = CoreInfoManager.Instance.GetCoreInfo(coreType);
 
         var displayLog = node.ConfigType != EConfigType.Custom || node.DisplayLog;

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs

@@ -22,7 +22,7 @@ public partial class CoreConfigSingboxService
         }
         if (withSelector)
         {
-            var proxyTags = proxyOutboundList.Where(n => n.tag.StartsWith(baseTagName)).Select(n => n.tag).ToList();
+            var proxyTags = proxyOutboundList.Where(n => n.tag.StartsWith(Global.ProxyTag)).Select(n => n.tag).ToList();
             if (proxyTags.Count > 1)
             {
                 proxyOutboundList.InsertRange(0, BuildSelectorOutbounds(proxyTags, baseTagName));

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -709,22 +709,18 @@ public class ProfilesViewModel : MyReactiveObject
 
     public async Task ServerSpeedtest(ESpeedActionType actionType)
     {
-        List<ProfileItem>? lstSelected;
-        if (actionType is ESpeedActionType.Mixedtest or ESpeedActionType.FastRealping)
+        if (actionType == ESpeedActionType.Mixedtest)
         {
-            if (actionType == ESpeedActionType.FastRealping)
-            {
-                actionType = ESpeedActionType.Realping;
-            }
-
-            lstSelected = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(ProfileItems?.OrderBy(t => t.Sort)));
+            SelectedProfiles = ProfileItems;
         }
-        else
+        else if (actionType == ESpeedActionType.FastRealping)
         {
-            lstSelected = await GetProfileItems(false);
+            SelectedProfiles = ProfileItems;
+            actionType = ESpeedActionType.Realping;
         }
 
-        if (lstSelected is null || lstSelected.Count <= 0)
+        var lstSelected = await GetProfileItems(false);
+        if (lstSelected == null)
         {
             return;
         }