Merge pull request #6072 from AvaloniaUI/fixes/animationinstance-unsu…

…bscribe Ensure we unsubscribe from PropertyChanged.
AvaloniaUI · Jun 17, 2021 · 60f3599 · 60f3599
2 parents 665560b + 4e8afe6
commit 60f3599
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Avalonia.Animation/AnimationInstance`1.cs b/src/Avalonia.Animation/AnimationInstance`1.cs
@@ -37,6 +37,7 @@ internal class AnimationInstance<T> : SingleSubscriberObservableBase<T>
         private IDisposable _timerSub;
         private readonly IClock _baseClock;
         private IClock _clock;
+        private EventHandler<AvaloniaPropertyChangedEventArgs> _propertyChangedDelegate;
 
         public AnimationInstance(Animation animation, Animatable control, Animator<T> animator, IClock baseClock, Action OnComplete, Func<double, T, T> Interpolator)
         {
@@ -46,9 +47,6 @@ public AnimationInstance(Animation animation, Animatable control, Animator<T> an
             _onCompleteAction = OnComplete;
             _interpolator = Interpolator;
             _baseClock = baseClock;
-            control.PropertyChanged += ControlPropertyChanged;
-
-            UpdateNeutralValue();
             FetchProperties();
         }
 
@@ -82,6 +80,7 @@ protected override void Unsubscribed()
             // Animation may have been stopped before it has finished.
             ApplyFinalFill();
 
+            _targetControl.PropertyChanged -= _propertyChangedDelegate;
             _timerSub?.Dispose();
             _clock.PlayState = PlayState.Stop;
         }
@@ -90,6 +89,9 @@ protected override void Subscribed()
         {
             _clock = new Clock(_baseClock);
             _timerSub = _clock.Subscribe(Step);
+            _propertyChangedDelegate ??= ControlPropertyChanged;
+            _targetControl.PropertyChanged += _propertyChangedDelegate;
+            UpdateNeutralValue();
         }
 
         public void Step(TimeSpan frameTick)