Adds shutdown method

MaxEdwards20 · Apr 5, 2024 · f1959ea · f1959ea
1 parent 9bdaf05
commit f1959ea
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/Client/Menu/GamePlayView.cs b/src/Client/Menu/GamePlayView.cs
@@ -113,7 +113,7 @@ private MenuStateEnum handleSwitchToMainMenu()
             try
             {
                 MessageQueueClient.instance.sendMessage(new Shared.Messages.Disconnect());
-                MessageQueueClient.instance.shutdown();
+                MessageQueueClient.shutdown();
             }
             catch (SocketException e)
             {

diff --git a/src/Client/MessageQueueClient.cs b/src/Client/MessageQueueClient.cs
@@ -75,13 +75,18 @@ public bool initialize(string address, ushort port)
         /// <summary>
         /// Gracefully shutdown the network connection and related activities
         /// </summary>
-        public void shutdown()
+
+        public static void shutdown()
         {
-            m_keepRunning = false;
-            m_eventSendMessages.Set();
-            m_socketServer.Shutdown(SocketShutdown.Both);
-            m_socketServer.Disconnect(false);
-            m_socketServer.Close();
+            if (m_instance != null)
+            {
+                m_instance.m_keepRunning = false;
+                m_instance.m_eventSendMessages.Set();
+                m_instance.m_socketServer.Shutdown(SocketShutdown.Both);
+                m_instance.m_socketServer.Disconnect(false);
+                m_instance.m_socketServer.Close();
+                m_instance = null;
+            }
         }
 
         /// <summary>