Move ExitCleanup to GameManager.cs

Author: valkyrienyanko

Scripts/Scenes/Main/GameManager.cs

@@ -1,5 +1,6 @@
 using Godot;
 using System;
+using System.Threading.Tasks;
 
 namespace GodotModules
 {
@@ -26,6 +27,55 @@ public override void _Input(InputEvent @event)
                 UtilOptions.ToggleFullscreen();
         }
 
+        public override async void _Notification(int what)
+        {
+            if (what == MainLoop.NotificationWmQuitRequest)
+            {
+                Instance.GetTree().SetAutoAcceptQuit(false);
+
+                await ExitCleanup();
+            }
+        }
+
+        /// <summary>
+        /// All cleanup should be done in here
+        /// </summary>
+        private static async Task ExitCleanup()
+        {
+            try
+            {
+                if (NetworkManager.GameServer != null)
+                    if (NetworkManager.GameServer.IsRunning)
+                    {
+                        NetworkManager.GameServer.ENetCmds.Enqueue(new ENetCmd(ENetOpcode.ClientWantsToExitApp));
+                        NetworkManager.GameServer.Dispose();
+                        NetworkManager.GameServer.Stop();
+                    }
+
+                if (NetworkManager.GameClient != null)
+                    if (NetworkManager.GameClient.IsRunning)
+                    {
+                        NetworkManager.GameClient.Dispose();
+                        NetworkManager.GameClient.Stop();
+                    }
+
+                UtilOptions.SaveOptions();
+                NetworkManager.WebClient.Dispose();
+
+                //if (SceneGameServers.PingServersCTS != null)
+                //SceneGameServers.PingServersCTS.Dispose();
+                if (NetworkManager.ClientConnectingTokenSource != null)
+                    NetworkManager.ClientConnectingTokenSource.Dispose();
+            }
+            catch (Exception e)
+            {
+                Logger.LogErr(e, "Game exit cleanup");
+                await Task.Delay(3000);
+            }
+
+            Instance.GetTree().Quit();
+        }
+
         public static void SpawnPopupMessage(string message)
         {
             var popupMessage = Prefabs.PopupMessage.Instance<UIPopupMessage>();

Scripts/Scenes/Main/NetworkManager.cs

@@ -14,9 +14,9 @@ public class NetworkManager : Node
         public static ConcurrentQueue<GodotCmd> GodotCmds { get; set; }
         public static GameServer GameServer { get; set; }
         public static GameClient GameClient { get; set; }
-        private static WebClient WebClient { get; set; }
+        public static WebClient WebClient { get; set; }
         public static NetworkManager Instance { get; set; }
-        private static CancellationTokenSource ClientConnectingTokenSource { get; set; }
+        public static CancellationTokenSource ClientConnectingTokenSource { get; set; }
 
         public static DisconnectOpcode DisconnectOpcode { get; set; }
         public static uint PeerId { get; set; } // this clients peer id (grabbed from server at some point)
@@ -107,54 +107,6 @@ public override async void _Process(float delta)
             }
         }
 
-        public override void _Notification(int what)
-        {
-            if (what == MainLoop.NotificationWmQuitRequest)
-            {
-                Instance.GetTree().SetAutoAcceptQuit(false);
-
-                ExitCleanup();
-            }
-        }
-
-        /// <summary>
-        /// All cleanup should be done in here
-        /// </summary>
-        private static void ExitCleanup()
-        {
-            try
-            {
-                if (NetworkManager.GameServer != null)
-                    if (NetworkManager.GameServer.IsRunning)
-                    {
-                        GameServer.ENetCmds.Enqueue(new ENetCmd(ENetOpcode.ClientWantsToExitApp));
-                        GameServer.Dispose();
-                        GameServer.Stop();
-                    }
-
-                if (NetworkManager.GameClient != null)
-                    if (NetworkManager.GameClient.IsRunning)
-                    {
-                        GameClient.Dispose();
-                        GameClient.Stop();
-                    }
-
-                UtilOptions.SaveOptions();
-                WebClient.Dispose();
-
-                //if (SceneGameServers.PingServersCTS != null)
-                //SceneGameServers.PingServersCTS.Dispose();
-                if (ClientConnectingTokenSource != null)
-                    ClientConnectingTokenSource.Dispose();
-            }
-            catch (Exception e)
-            {
-                GD.Print("Exception on game exit cleanup: " + e);
-            }
-
-            Instance.GetTree().Quit();
-        }
-
         public static void StartClient(string ip, ushort port)
         {
             if (GameClient != null)