Merge f7409053cd into b5800f7dfc

v2rayN/ServiceLib/Handler/CoreConfigHandler.cs

@@ -192,10 +192,10 @@ public static class CoreConfigHandler
         var newItems = new List<ProfileItem> { node };
         if (node.ConfigType.IsGroupType())
         {
-            var groupChildList = await GroupProfileManager.GetAllChildProfileItems(node);
-            foreach (var childItem in groupChildList)
+            var (groupChildList, _) = await GroupProfileManager.GetChildProfileItems(node);
+            foreach (var childItem in groupChildList.Where(childItem => !context.AllProxiesMap.ContainsKey(childItem.IndexId)))
             {
-                context.AllProxiesMap[childItem.IndexId] = childItem;
+                await FillNodeContext(context, childItem, false);
             }
             node.SetProtocolExtra(node.GetProtocolExtra() with
             {

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

@@ -348,6 +348,10 @@ public partial class CoreConfigSingboxService
     private void GenMinimizedDns()
     {
         GenDnsServers();
+        foreach (var server in _coreConfig.dns!.servers.Where(s => !string.IsNullOrEmpty(s.detour)).ToList())
+        {
+            _coreConfig.dns.servers.Remove(server);
+        }
         _coreConfig.dns ??= new();
         _coreConfig.dns.rules ??= [];
         _coreConfig.dns.rules.Clear();