Fix disposing of NetManager

project-fika · Jul 8, 2024 · bd649d3 · bd649d3
1 parent f93e403
commit bd649d3
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/Fika.Core/Coop/Utils/NetManagerUtils.cs b/Fika.Core/Coop/Utils/NetManagerUtils.cs
@@ -59,14 +59,18 @@ public static void DestroyNetManager(bool isServer)
             {
                 if (isServer)
                 {
-                    Singleton<FikaServer>.Instance.NetServer.Stop();
-                    Singleton<FikaServer>.TryRelease(Singleton<FikaServer>.Instance);
+                    FikaServer server = Singleton<FikaServer>.Instance;
+                    server.NetServer.Stop();
+                    Singleton<FikaServer>.TryRelease(server);
+                    GameObject.Destroy(server);
                     logger.LogInfo("Destroyed FikaServer");
                 }
                 else
                 {
-                    Singleton<FikaClient>.Instance.NetClient.Stop();
-                    Singleton<FikaClient>.TryRelease(Singleton<FikaClient>.Instance);
+                    FikaClient client = Singleton<FikaClient>.Instance;
+                    client.NetClient.Stop();
+                    Singleton<FikaClient>.TryRelease(client);
+                    GameObject.Destroy(client);
                     logger.LogInfo("Destroyed FikaClient");
                 }
             }
@@ -75,10 +79,12 @@ public static void DestroyNetManager(bool isServer)
         public static void DestroyPingingClient()
         {
             if (FikaGameObject != null)
-            {
-                Singleton<FikaPingingClient>.Instance.StopKeepAliveRoutine();
-                Singleton<FikaPingingClient>.Instance.NetClient.Stop();
-                Singleton<FikaPingingClient>.TryRelease(Singleton<FikaPingingClient>.Instance);
+            { 
+                FikaPingingClient pingingClient = Singleton<FikaPingingClient>.Instance;
+                pingingClient.StopKeepAliveRoutine();
+                pingingClient.NetClient.Stop();
+                Singleton<FikaPingingClient>.TryRelease(pingingClient);
+                GameObject.Destroy(pingingClient);
                 logger.LogInfo("Destroyed FikaPingingClient");
             }
         }