github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

bug fixes

pull/3828/head
2dust 2023-05-04 20:28:38 +08:00
parent b469d73385
commit c8b01a5530
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
v2rayN/v2rayN/Handler/CoreHandler.cs
View File

@ -165,7 +165,8 @@ namespace v2rayN.Handler
} }
var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType); var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
var proc = RunProcess(node, coreInfo, "", ShowMsg); var displayLog = node.configType != EConfigType.Custom || node.displayLog;
var proc = RunProcess(node, coreInfo, "", displayLog, ShowMsg);
if (proc is null) if (proc is null)
{ {
return; return;
@ -188,7 +189,7 @@ namespace v2rayN.Handler
if (CoreConfigHandler.GenerateClientConfig(itemSocks, fileName2, out string msg2, out string configStr) == 0) if (CoreConfigHandler.GenerateClientConfig(itemSocks, fileName2, out string msg2, out string configStr) == 0)
{ {
var coreInfo2 = LazyConfig.Instance.GetCoreInfo(ECoreType.sing_box); var coreInfo2 = LazyConfig.Instance.GetCoreInfo(ECoreType.sing_box);
var proc2 = RunProcess(node, coreInfo2, $" -c {Global.corePreConfigFileName}", ShowMsg); var proc2 = RunProcess(node, coreInfo2, $" -c {Global.corePreConfigFileName}", true, ShowMsg);
if (proc2 is not null) if (proc2 is not null)
{ {
_processPre = proc2; _processPre = proc2;
@ -271,7 +272,7 @@ namespace v2rayN.Handler
#region Process #region Process
private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, Action<bool, string> update) private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog, Action<bool, string> update)
{ {
try try
{ {
@ -280,7 +281,6 @@ namespace v2rayN.Handler
{ {
return null; return null;
} }
var displayLog = node.configType != EConfigType.Custom || node.displayLog;
Process proc = new() Process proc = new()
{ {
StartInfo = new ProcessStartInfo StartInfo = new ProcessStartInfo