dispose LineCombatant on plugin deinit

marzent · May 28, 2023 · 41ba0a2 · 41ba0a2
1 parent 3381150
commit 41ba0a2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/OverlayPlugin.Core/Integration/LineCombatant.cs b/OverlayPlugin.Core/Integration/LineCombatant.cs
@@ -11,7 +11,7 @@
 
 namespace RainbowMage.OverlayPlugin.MemoryProcessors.Combatant
 {
-    public class LineCombatant
+    public class LineCombatant: IDisposable
     {
         public const uint LogFileLineID = 261;
         private ILogger logger;
@@ -216,11 +216,14 @@ public LineCombatant(TinyIoCContainer container)
         }
 
         ~LineCombatant()
+        {
+            Dispose();
+        }
+
+        public void Dispose()
         {
             if (cancellationToken != null)
-            {
                 cancellationToken.Cancel();
-            }
         }
 
         private void PollCombatants()

diff --git a/OverlayPlugin.Core/PluginMain.cs b/OverlayPlugin.Core/PluginMain.cs
@@ -334,6 +334,9 @@ public void DeInitPlugin()
 
                 this.Overlays.Clear();
             }
+
+            var lineCombatant = _container.Resolve<LineCombatant>();
+            lineCombatant.Dispose();
 
             try
             {