Browse Source

Merge pull request #3010 from AvaloniaUI/fix-transitions

Fix transitions since the last PR.
Jumar Macato 6 years ago
parent
commit
06710056ab
1 changed files with 6 additions and 1 deletions
  1. 6 1
      src/Avalonia.Animation/Animatable.cs

+ 6 - 1
src/Avalonia.Animation/Animatable.cs

@@ -55,6 +55,11 @@ namespace Avalonia.Animation
             }
             set
             {
+                if (value is null)
+                    return;
+
+                if (_previousTransitions is null)
+                    _previousTransitions = new Dictionary<AvaloniaProperty, IDisposable>();
 
                 SetAndRaise(TransitionsProperty, ref _transitions, value);
             }
@@ -70,7 +75,7 @@ namespace Avalonia.Animation
             if (_transitions is null || _previousTransitions is null || e.Priority == BindingPriority.Animation) return;
 
             // PERF-SENSITIVE: Called on every property change. Don't use LINQ here (too many allocations).
-            foreach (var transition in Transitions)
+            foreach (var transition in _transitions)
             {
                 if (transition.Property == e.Property)
                 {