Added some error handling specific to the bot listener thread

KarlOfDuty · Oct 26, 2024 · d143d1d · d143d1d
1 parent ec0bff9
commit d143d1d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/SCPDiscordPlugin/BotListener.cs b/SCPDiscordPlugin/BotListener.cs
@@ -108,6 +108,11 @@ public BotListener()
 
           Thread.Sleep(500);
         }
+        catch (ThreadAbortException)
+        {
+          // Break out of the loop if the thread is aborted
+          break;
+        }
         catch (Exception ex)
         {
           Logger.Error("BotListener Error: " + ex);

diff --git a/SCPDiscordPlugin/NetworkSystem.cs b/SCPDiscordPlugin/NetworkSystem.cs
@@ -204,8 +204,10 @@ private static void Connect()
         {
           if (socket != null && socket.IsBound)
           {
+            Logger.Warn("Aborting existing message thread...");
             messageThread?.Abort();
             socket.Close();
+            Thread.Sleep(500);
           }
 
           socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);