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

Improve tun mode log

pull/2962/head
2dust 2023-01-02 20:22:00 +08:00
parent 837f0ca393
commit 9d38d89c25
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
v2rayN/v2rayN/Handler/TunHandler.cs
View File

@ -200,6 +200,7 @@ namespace v2rayN.Base
{ {
return; return;
} }
var showWindow = _config.tunModeItem.showWindow;
Process p = new Process Process p = new Process
{ {
StartInfo = new ProcessStartInfo StartInfo = new ProcessStartInfo
@ -207,8 +208,9 @@ namespace v2rayN.Base
FileName = fileName, FileName = fileName,
Arguments = $"run -c {Utils.GetConfigPath(_tunConfigName)}", Arguments = $"run -c {Utils.GetConfigPath(_tunConfigName)}",
WorkingDirectory = Utils.GetConfigPath(), WorkingDirectory = Utils.GetConfigPath(),
UseShellExecute = _config.tunModeItem.showWindow, UseShellExecute = showWindow,
CreateNoWindow = !_config.tunModeItem.showWindow, CreateNoWindow = !showWindow,
RedirectStandardError = !showWindow,
Verb = "runas", Verb = "runas",
} }
}; };
@ -217,7 +219,14 @@ namespace v2rayN.Base
_isRunning = true; _isRunning = true;
if (p.WaitForExit(1000)) if (p.WaitForExit(1000))
{ {
throw new Exception("start tun mode fail"); if (showWindow)
{
throw new Exception("start tun mode fail");
}
else
{
throw new Exception(p.StandardError.ReadToEnd());
}
} }
Global.processJob.AddProcess(p.Handle); Global.processJob.AddProcess(p.Handle);