more thread safety

Author: valkyrienyanko

Scripts/Netcode/Client/ENetClient.cs

@@ -73,10 +73,7 @@ public async void Start(string ip, ushort port)
         /// </summary>
         public void Stop() => ENetCmds.Enqueue(new ENetCmd(ENetOpcode.ClientWantsToDisconnect));
 
-        public void CancelTask()
-        {
-            CancelTokenSource.Cancel();
-        }
+        public void CancelTask() => ENetCmds.Enqueue(new ENetCmd(ENetOpcode.CancelTask));
 
         public void Log(object obj) => Logger.Log($"[Client]: {obj}", ConsoleColor.Yellow);
 
@@ -138,6 +135,9 @@ private async Task ENetThreadWorker(string ip, ushort port)
                         case ENetOpcode.ClientWantsToDisconnect:
                             peer.Disconnect(0);
                             break;
+                        case ENetOpcode.CancelTask:
+                            CancelTokenSource.Cancel();
+                            break;
                     }
                 }
 

Scripts/Netcode/Common/_Opcodes.cs

@@ -115,6 +115,7 @@ public enum ENetOpcode
         RestartServer,
         ClientWantsToExitApp,
         ClientWantsToDisconnect,
+        CancelTask,
         Dispose
     }
 }

Scripts/Scenes/Main/NetworkManager.cs

@@ -203,7 +203,7 @@ public static void CancelClientConnectingTokenSource()
                 return;
 
             ClientConnectingTokenSource.Cancel();
-            GameClient.CancelTask(); // THREAD SAFETY VIOLATION
+            GameClient.CancelTask();
         }
     }