INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-06-10 15:20:48 -05:00
Code Issues Releases Wiki Activity

Merge branch '2.3' into 2.4-pr

Browse Source
This commit is contained in:
RaidMax
2019-09-26 16:11:58 -05:00
parent 878f2e6cc6 87c1880268
commit 3b5c7ec84f
7 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Application/IW4MServer.cs
View File

@ -648,8 +648,12 @@ namespace IW4MAdmin
// because we don't want to try to fill up a slot that's not empty yet
waiterList.Add(e);
}
// wait for all the disconnect tasks to finish
await Task.WhenAll(waiterList.Select(e => e.WaitAsync(Utilities.DefaultCommandTimeout, Manager.CancellationToken)));
foreach (var waiter in waiterList)
{
waiter.Wait();
}
waiterList.Clear();
// this are our new connecting clients
@ -673,7 +677,10 @@ namespace IW4MAdmin
}
// wait for all the connect tasks to finish
await Task.WhenAll(waiterList.Select(e => e.WaitAsync(Utilities.DefaultCommandTimeout, Manager.CancellationToken)));
foreach (var waiter in waiterList)
{
waiter.Wait();
}
waiterList.Clear();
// these are the clients that have updated
@ -690,7 +697,10 @@ namespace IW4MAdmin
waiterList.Add(e);
}
await Task.WhenAll(waiterList.Select(e => e.WaitAsync(Utilities.DefaultCommandTimeout, Manager.CancellationToken)));
foreach (var waiter in waiterList)
{
waiter.Wait();
}
if (ConnectionErrors > 0)
{