mirror of
https://github.com/2dust/v2rayN.git
synced 2025-10-14 12:29:13 +00:00
Fixes
This commit is contained in:
parent
46688d04b3
commit
bf73e0c858
2 changed files with 5 additions and 5 deletions
|
@ -256,7 +256,7 @@ public sealed class AppHandler
|
||||||
var coreType = GetCoreType(profileItem, profileItem.ConfigType);
|
var coreType = GetCoreType(profileItem, profileItem.ConfigType);
|
||||||
ECoreType? preCoreType = null;
|
ECoreType? preCoreType = null;
|
||||||
|
|
||||||
var pureEndpointCore = GetSplitCoreType(profileItem, profileItem.ConfigType);
|
var pureEndpointCore = profileItem.CoreType ?? GetSplitCoreType(profileItem, profileItem.ConfigType);
|
||||||
var splitRouteCore = _config.SplitCoreItem.RouteCoreType;
|
var splitRouteCore = _config.SplitCoreItem.RouteCoreType;
|
||||||
var enableTun = _config.TunModeItem.EnableTun;
|
var enableTun = _config.TunModeItem.EnableTun;
|
||||||
|
|
||||||
|
|
|
@ -23,11 +23,11 @@ public class CoreConfigHandler
|
||||||
_ => await GenerateClientCustomConfig(node, fileName)
|
_ => 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);
|
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);
|
result = await new CoreConfigV2rayService(config).GenerateClientConfigContent(node);
|
||||||
}
|
}
|
||||||
|
@ -159,7 +159,7 @@ public class CoreConfigHandler
|
||||||
{
|
{
|
||||||
result = await new CoreConfigSingboxService(config).GenerateClientSpeedtestConfig(node, port);
|
result = await new CoreConfigSingboxService(config).GenerateClientSpeedtestConfig(node, port);
|
||||||
}
|
}
|
||||||
else
|
else if (Global.XraySupportConfigType.Contains(node.ConfigType))
|
||||||
{
|
{
|
||||||
result = await new CoreConfigV2rayService(config).GenerateClientSpeedtestConfig(node, port);
|
result = await new CoreConfigV2rayService(config).GenerateClientSpeedtestConfig(node, port);
|
||||||
}
|
}
|
||||||
|
@ -179,7 +179,7 @@ public class CoreConfigHandler
|
||||||
{
|
{
|
||||||
result = await new CoreConfigSingboxService(config).GenerateClientMultipleLoadConfig(selecteds);
|
result = await new CoreConfigSingboxService(config).GenerateClientMultipleLoadConfig(selecteds);
|
||||||
}
|
}
|
||||||
else
|
else if (coreType == ECoreType.Xray)
|
||||||
{
|
{
|
||||||
result = await new CoreConfigV2rayService(config).GenerateClientMultipleLoadConfig(selecteds, multipleLoad);
|
result = await new CoreConfigV2rayService(config).GenerateClientMultipleLoadConfig(selecteds, multipleLoad);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue