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

Fix mixed sync/async ops on Process streams.

pull/4711/head
Minghao Hu 2023-12-24 16:21:21 +09:00
parent b0c5f74edb
commit ba246e99e8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,7 +147,7 @@ namespace v2rayN.Handler
}
}
private string CoreFindexe(CoreInfo coreInfo)
private string CoreFindExe(CoreInfo coreInfo)
{
string fileName = string.Empty;
foreach (string name in coreInfo.coreExes)
@ -225,7 +225,7 @@ namespace v2rayN.Handler
try
{
var coreInfo = LazyConfig.Instance.GetCoreInfo(ECoreType.Xray);
string fileName = CoreFindexe(coreInfo);
string fileName = CoreFindExe(coreInfo);
if (fileName == "") return -1;
Process p = new()
@ -269,6 +269,7 @@ namespace v2rayN.Handler
if (p.WaitForExit(1000))
{
p.CancelErrorRead();
throw new Exception(p.StandardError.ReadToEnd());
}
@ -295,7 +296,7 @@ namespace v2rayN.Handler
{
try
{
string fileName = CoreFindexe(coreInfo);
string fileName = CoreFindExe(coreInfo);
if (Utils.IsNullOrEmpty(fileName))
{
return null;
@ -343,6 +344,7 @@ namespace v2rayN.Handler
if (proc.WaitForExit(1000))
{
proc.CancelErrorRead();
throw new Exception(displayLog ? proc.StandardError.ReadToEnd() : "启动进程失败并退出 (Failed to start the process and exited)");
}