Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
529b6613e9 | ||
|
|
8a5d8cdf8a | ||
|
|
cdf35740d9 | ||
|
|
76c40585fd | ||
|
|
2bf58288d3 |
@@ -1370,15 +1370,17 @@ namespace v2rayN.Forms
|
|||||||
|
|
||||||
private void tsbCheckUpdateN_Click(object sender, EventArgs e)
|
private void tsbCheckUpdateN_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
void _updateUI(bool success, string msg)
|
Process.Start(Global.UpdateUrl);
|
||||||
{
|
|
||||||
AppendText(false, msg);
|
//void _updateUI(bool success, string msg)
|
||||||
if (success)
|
//{
|
||||||
{
|
// AppendText(false, msg);
|
||||||
menuExit_Click(null, null);
|
// if (success)
|
||||||
}
|
// {
|
||||||
};
|
// menuExit_Click(null, null);
|
||||||
(new UpdateHandle()).CheckUpdateGuiN(config, _updateUI, config.checkPreReleaseUpdate);
|
// }
|
||||||
|
//};
|
||||||
|
//(new UpdateHandle()).CheckUpdateGuiN(config, _updateUI, config.checkPreReleaseUpdate);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void tsbCheckUpdateCore_Click(object sender, EventArgs e)
|
private void tsbCheckUpdateCore_Click(object sender, EventArgs e)
|
||||||
|
|||||||
@@ -458,7 +458,7 @@ namespace v2rayN.Handler
|
|||||||
throw new ArgumentException("Type");
|
throw new ArgumentException("Type");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (string.Compare(curVersion, version, true) >= 0)
|
if (curVersion == version)
|
||||||
{
|
{
|
||||||
AbsoluteCompleted?.Invoke(this, new ResultEventArgs(false, message));
|
AbsoluteCompleted?.Invoke(this, new ResultEventArgs(false, message));
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -515,6 +515,16 @@ namespace v2rayN.Handler
|
|||||||
outbound.mux.enabled = false;
|
outbound.mux.enabled = false;
|
||||||
outbound.mux.concurrency = -1;
|
outbound.mux.concurrency = -1;
|
||||||
}
|
}
|
||||||
|
else if (node.streamSecurity == Global.StreamSecurity)
|
||||||
|
{
|
||||||
|
if (!Utils.IsNullOrEmpty(node.flow))
|
||||||
|
{
|
||||||
|
usersItem.flow = node.flow;
|
||||||
|
|
||||||
|
outbound.mux.enabled = false;
|
||||||
|
outbound.mux.concurrency = -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
outbound.protocol = Global.vlessProtocolLite;
|
outbound.protocol = Global.vlessProtocolLite;
|
||||||
outbound.settings.servers = null;
|
outbound.settings.servers = null;
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ namespace v2rayN.Handler
|
|||||||
}
|
}
|
||||||
|
|
||||||
//start a socks service
|
//start a socks service
|
||||||
if (item.configType == EConfigType.Custom && item.preSocksPort > 0)
|
if (_process != null && !_process.HasExited && item.configType == EConfigType.Custom && item.preSocksPort > 0)
|
||||||
{
|
{
|
||||||
var itemSocks = new VmessItem()
|
var itemSocks = new VmessItem()
|
||||||
{
|
{
|
||||||
@@ -239,7 +239,7 @@ namespace v2rayN.Handler
|
|||||||
|
|
||||||
if (p.WaitForExit(1000))
|
if (p.WaitForExit(1000))
|
||||||
{
|
{
|
||||||
throw new Exception(p.StandardError.ReadToEnd());
|
throw new Exception(coreInfo.redirectInfo ? p.StandardError.ReadToEnd() : "启动进程失败并退出 (Failed to start the process and exited)");
|
||||||
}
|
}
|
||||||
|
|
||||||
Global.processJob.AddProcess(p.Handle);
|
Global.processJob.AddProcess(p.Handle);
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<OutputType>WinExe</OutputType>
|
<OutputType>WinExe</OutputType>
|
||||||
<UseWindowsForms>true</UseWindowsForms>
|
<UseWindowsForms>true</UseWindowsForms>
|
||||||
<Copyright>Copyright © 2019-2022 (GPLv3)</Copyright>
|
<Copyright>Copyright © 2019-2022 (GPLv3)</Copyright>
|
||||||
<FileVersion>5.38</FileVersion>
|
<FileVersion>5.39</FileVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ApplicationIcon>v2rayN.ico</ApplicationIcon>
|
<ApplicationIcon>v2rayN.ico</ApplicationIcon>
|
||||||
|
|||||||
Reference in New Issue
Block a user