Make sure there are no multithreading deadlocks :)

jnccd · Apr 23, 2024 · 74358de · 74358de
1 parent 7766490
commit 74358de
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/MEE7-Discord-Bot/BuildDate.txt b/MEE7-Discord-Bot/BuildDate.txt
@@ -1 +1 @@
-24.04.2024  0:26:39,02 
+24.04.2024  0:38:33,29 
diff --git a/MEE7-Discord-Bot/Commands/Lighthouse.cs b/MEE7-Discord-Bot/Commands/Lighthouse.cs
@@ -53,12 +53,13 @@ public override void Execute(IMessage message)
             var split = message.Content.Split(' ');
             if (split.Length >= 3 && split[1] == "set-token") 
             {
+                cancelTokenSource.Cancel();
+                lighthouseThread.Wait();
+
                 lock (images)
                 {
-                    cancelTokenSource.Cancel();
-                    lighthouseThread.Wait();
                     token = split[2];
-                    cancelTokenSource.TryReset();
+                    cancelTokenSource = new();
                     cancelToken = cancelTokenSource.Token;
                     StartSenderLoop();
                 }
@@ -107,6 +108,9 @@ public void StartSenderLoop()
                         {
                             sw.Restart();
 
+                            if (cancelToken.IsCancellationRequested)
+                                break;
+
                             lock (images)
                             {
                                 webSocketClient.SendAsync(PackMessage(imageCounter), WebSocketMessageType.Binary, true, default)