GitHub/netch
1
0
Fork 0
mirror of https://github.com/netchx/netch.git synced 2026-03-14 17:43:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert NatTest Monitor lock

Browse Source
This commit is contained in:
ChsBuffer
2021-05-28 14:51:30 +08:00
parent 4af18025a7
commit 86b1741dd0
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Netch/Controllers/NTTController.cs
View File

@@ -36,7 +36,7 @@ namespace Netch.Controllers
try
{
File.WriteAllText(Path.Combine(Global.NetchDir, $"logging\\{Name}.log"), $"{output}\r\n{error}");
await File.WriteAllTextAsync(Path.Combine(Global.NetchDir, $"logging\\{Name}.log"), $"{output}\r\n{error}");
}
catch (Exception e)
{

9
Netch/Forms/MainForm.cs
View File

@@ -1110,7 +1110,7 @@ namespace Netch.Forms
await NatTest();
}
private readonly object _natTestLock = new();
private bool _natTestLock = true;
/// <summary>
/// 测试 NAT
@@ -1120,13 +1120,16 @@ namespace Netch.Forms
if (!MainController.Mode!.TestNatRequired())
return;
if (!Monitor.TryEnter(_natTestLock))
if (!_natTestLock)
return;
_natTestLock = false;
try
{
NatTypeStatusText(i18N.Translate("Starting NatTester"));
// Monitor.TryEnter() Monitor.Exit() (a.k.a. lock) not work with async/await
var (result, _, publicEnd) = await MainController.NTTController.Start();
if (!string.IsNullOrEmpty(publicEnd))
@@ -1141,7 +1144,7 @@ namespace Netch.Forms
}
finally
{
Monitor.Exit(_natTestLock);
_natTestLock = true;
}
}