From 6872b2a8a46cb47eb18cdc85cdff91e7e4394db2 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 15 Jun 2021 11:53:40 +0200
Subject: [PATCH] Ensure we unsubscribe from PropertyChanged.

---
 src/Avalonia.Animation/AnimationInstance`1.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Animation/AnimationInstance`1.cs b/src/Avalonia.Animation/AnimationInstance`1.cs
index 0e1882ce75..b9ba49e510 100644
--- a/src/Avalonia.Animation/AnimationInstance`1.cs
+++ b/src/Avalonia.Animation/AnimationInstance`1.cs
@@ -46,9 +46,6 @@ namespace Avalonia.Animation
             _onCompleteAction = OnComplete;
             _interpolator = Interpolator;
             _baseClock = baseClock;
-            control.PropertyChanged += ControlPropertyChanged;
-
-            UpdateNeutralValue();
             FetchProperties();
         }
 
@@ -82,6 +79,7 @@ namespace Avalonia.Animation
             // Animation may have been stopped before it has finished.
             ApplyFinalFill();
 
+            _targetControl.PropertyChanged -= ControlPropertyChanged;
             _timerSub?.Dispose();
             _clock.PlayState = PlayState.Stop;
         }
@@ -90,6 +88,8 @@ namespace Avalonia.Animation
         {
             _clock = new Clock(_baseClock);
             _timerSub = _clock.Subscribe(Step);
+            _targetControl.PropertyChanged += ControlPropertyChanged;
+            UpdateNeutralValue();
         }
 
         public void Step(TimeSpan frameTick)