Fix #68

Author: valkyrienyanko

Scripts/Netcode/Client/ENetClient.cs

@@ -210,7 +210,7 @@ private async Task ENetThreadWorker(string ip, ushort port)
             Running = 0;
         }
 
-        private bool ConcurrentQueuesWorking() => NetworkManager.GodotCmds.Count != 0 || ENetCmds.Count != 0 || Outgoing.Count != 0;
+        private bool ConcurrentQueuesWorking() => ENetCmds.Count != 0 || Outgoing.Count != 0;
 
         public void Dispose()
         {

Scripts/Netcode/Server/ENetServer.cs

@@ -15,7 +15,7 @@ public abstract class ENetServer : IDisposable
         public ConcurrentQueue<ENetCmd> ENetCmds { get; set; }
         public ushort MaxPlayers { get; set; }
 
-        protected CancellationTokenSource CancelTokenSource { get; set; }
+        protected CancellationTokenSource CTS { get; set; }
         protected bool QueueRestart { get; set; }
         protected long SomeoneConnected = 0;
         protected long Running = 0;
@@ -38,11 +38,11 @@ public async Task Start(ushort port, int maxClients)
                 return;
             }
 
-            CancelTokenSource = new CancellationTokenSource();
+            CTS = new CancellationTokenSource();
 
             try
             {
-                await Task.Run(() => ENetThreadWorker(port, maxClients), CancelTokenSource.Token);
+                await Task.Run(() => ENetThreadWorker(port, maxClients), CTS.Token);
             }
             catch (Exception e)
             {
@@ -147,7 +147,7 @@ private async Task ENetThreadWorker(ushort port, int maxClients)
             Log($"Server listening on port {port}");
             Running = 1;
 
-            while (!CancelTokenSource.IsCancellationRequested)
+            while (!CTS.IsCancellationRequested)
             {
                 bool polled = false;
 
@@ -259,7 +259,7 @@ private void Send(ServerPacket gamePacket, Peer peer)
             peer.Send(channelID, ref packet);
         }
 
-        private bool ConcurrentQueuesWorking() => NetworkManager.GodotCmds.Count != 0 || ENetCmds.Count != 0 || Outgoing.Count != 0;
+        private bool ConcurrentQueuesWorking() => ENetCmds.Count != 0 || Outgoing.Count != 0;
 
         public virtual void Dispose()
         { }

Scripts/Netcode/Server/GameServer.cs

@@ -73,19 +73,19 @@ protected override void ServerCmds()
                         break;
 
                     case ENetOpcode.StopServer:
-                        if (CancelTokenSource.IsCancellationRequested)
+                        if (CTS.IsCancellationRequested)
                         {
                             Log("Server has been stopped already");
                             return;
                         }
 
-                        CancelTokenSource.Cancel();
+                        CTS.Cancel();
 
                         KickAll(DisconnectOpcode.Stopping);
                         break;
 
                     case ENetOpcode.RestartServer:
-                        if (CancelTokenSource.IsCancellationRequested)
+                        if (CTS.IsCancellationRequested)
                         {
                             Log("Server has been stopped already");
                             return;
@@ -97,12 +97,12 @@ protected override void ServerCmds()
                         break;
 
                     case ENetOpcode.ClientWantsToExitApp:
-                        CancelTokenSource.Cancel();
+                        CTS.Cancel();
                         KickAll(DisconnectOpcode.Stopping);
                         break;
 
                     case ENetOpcode.Dispose:
-                        CancelTokenSource.Dispose();
+                        CTS.Dispose();
                         EmitClientTransforms.Stop();
                         EmitClientTransforms.Dispose();
                         ServerSimulation.Stop();

Scripts/Scenes/Main/GameManager.cs

@@ -50,13 +50,19 @@ private static async Task ExitCleanup()
                         NetworkManager.GameServer.ENetCmds.Enqueue(new ENetCmd(ENetOpcode.ClientWantsToExitApp));
                         NetworkManager.GameServer.Dispose();
                         NetworkManager.GameServer.Stop();
+
+                        while (NetworkManager.GameServer.IsRunning)
+                            await Task.Delay(100);
                     }
 
                 if (NetworkManager.GameClient != null)
                     if (NetworkManager.GameClient.IsRunning)
                     {
                         NetworkManager.GameClient.Dispose();
                         NetworkManager.GameClient.Stop();
+
+                        while (NetworkManager.GameClient.IsRunning)
+                            await Task.Delay(100);
                     }
 
                 UtilOptions.SaveOptions();