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

remove tun Redirect Standard Error

pull/2969/head
2dust 2023-01-04 09:02:00 +08:00
parent 3dfd108fc4
commit 73a817c1cb
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,7 +210,7 @@ namespace v2rayN.Base
WorkingDirectory = Utils.GetConfigPath(), WorkingDirectory = Utils.GetConfigPath(),
UseShellExecute = showWindow, UseShellExecute = showWindow,
CreateNoWindow = !showWindow, CreateNoWindow = !showWindow,
RedirectStandardError = !showWindow, //RedirectStandardError = !showWindow,
Verb = "runas", Verb = "runas",
} }
}; };
@ -219,14 +219,14 @@ namespace v2rayN.Base
_isRunning = true; _isRunning = true;
if (p.WaitForExit(1000)) if (p.WaitForExit(1000))
{ {
if (showWindow) //if (showWindow)
{ //{
throw new Exception("start tun mode fail"); throw new Exception("start tun mode fail");
} //}
else //else
{ //{
throw new Exception(p.StandardError.ReadToEnd()); // throw new Exception(p.StandardError.ReadToEnd());
} //}
} }
Global.processJob.AddProcess(p.Handle); Global.processJob.AddProcess(p.Handle);

2
v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
View File

@ -226,7 +226,7 @@ namespace v2rayN.ViewModels
this.WhenAnyValue( this.WhenAnyValue(
x => x.SelectedMoveToGroup, x => x.SelectedMoveToGroup,
y => y != null && !y.remarks.IsNullOrEmpty()) y => y != null && !y.remarks.IsNullOrEmpty())
.Subscribe(c => MoveToGroup(c)); .Subscribe(c => MoveToGroup(c));
this.WhenAnyValue( this.WhenAnyValue(
x => x.SelectedRouting, x => x.SelectedRouting,

2
v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs
View File

@ -40,7 +40,7 @@ namespace v2rayN.Views
private void LstSubscription_MouseDoubleClick(object sender, MouseButtonEventArgs e) private void LstSubscription_MouseDoubleClick(object sender, MouseButtonEventArgs e)
{ {
ViewModel?.EditSub(false); ViewModel?.EditSub(false);
} }
private void menuClose_Click(object sender, System.Windows.RoutedEventArgs e) private void menuClose_Click(object sender, System.Windows.RoutedEventArgs e)
{ {