mirror of
https://github.com/2dust/v2rayN.git
synced 2026-04-16 04:25:45 +00:00
Compare commits
No commits in common. "7329dbae11e322e3b29edfea888253a628d9d118" and "2caf8ea14ffef15e12463b8bf8b524466b09db7e" have entirely different histories.
7329dbae11
...
2caf8ea14f
4 changed files with 4 additions and 7 deletions
|
|
@ -1,7 +1,7 @@
|
|||
<Project>
|
||||
|
||||
<PropertyGroup>
|
||||
<Version>7.20.1</Version>
|
||||
<Version>7.20.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -1432,7 +1432,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,
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
|
|
|
|||
Loading…
Reference in a new issue