Fix event handler leak

Washi1337 · Oct 19, 2024 · d677e83 · d677e83
1 parent dd7de46
commit d677e83
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/AvaloniaHex/Editing/CaretLayer.cs b/src/AvaloniaHex/Editing/CaretLayer.cs
@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Interactivity;
 using Avalonia.Media;
 using Avalonia.Threading;
 using AvaloniaHex.Rendering;
@@ -44,6 +45,15 @@ public CaretLayer(Caret caret)
 
         _blinkTimer.Tick += BlinkTimerOnTick;
     }
+
+    /// <inheritdoc />
+    protected override void OnUnloaded(RoutedEventArgs e)
+    {
+        base.OnUnloaded(e);
+
+        _blinkTimer.IsEnabled = false;
+        _blinkTimer.Tick -= BlinkTimerOnTick;
+    }
 
     /// <inheritdoc />
     public override LayerRenderMoments UpdateMoments => LayerRenderMoments.NoResizeRearrange;