Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-08-29 14:26:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix bug

Browse source
This commit is contained in:
chao wan 2024-04-05 18:57:41 +08:00
parent 5878929430
commit ed1a1f50af
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
v2rayN/v2rayN/Handler/CoreHandler.cs
View file

@ -31,21 +31,24 @@ namespace v2rayN.Handler
}
public void LoadCore(bool isForce = false)
{
List<AutoResetEvent> executingResetEvents;
{
AutoResetEvent? loadResetEvent = default;
List<AutoResetEvent>? executingResetEvents = default;
lock (loadResetEvents)
{
if (isForce && isLoading)
if (!isForce && isLoading)
{
var loadResetEvent = new AutoResetEvent(false);
lock (loadResetEvents) loadResetEvents.Add(loadResetEvent);
loadResetEvent.WaitOne();
return;
loadResetEvent = new AutoResetEvent(false);
loadResetEvents.Add(loadResetEvent);
}
isLoading = true;
executingResetEvents = new(loadResetEvents);
loadResetEvents.Clear();
}
else
{
isLoading = true;
executingResetEvents = new(loadResetEvents);
loadResetEvents.Clear();
}
}
if (loadResetEvent?.WaitOne() == true) return;
var node = ConfigHandler.GetDefaultServer(_config);
string fileName = Utils.GetConfigPath(Global.CoreConfigFileName);
var result = CoreConfigHandler.GenerateClientConfig(node!, fileName, out string msg, out string content);
@ -57,7 +60,7 @@ namespace v2rayN.Handler
Utils.RemoveDeviceForPnputil(Utils.GetSingboxTunDeviceInstanceId(Global.DefaultSingboxTunDeviceName));
CoreStart(node);
}
executingResetEvents.ForEach(result => result.Set());
executingResetEvents?.ForEach(result => result.Set());
lock(loadResetEvents)
{
if(loadResetEvents.Count > 0)