From 9eeb3ee3400e9717b92b1e740b50f9de0c222b12 Mon Sep 17 00:00:00 2001
From: DmitryZhelnin <mitya_zh@mail.ru>
Date: Tue, 19 Sep 2023 03:52:40 +0300
Subject: [PATCH] Animatable: subscribe to collection changes only if
 transitions are already enabled. (#12861)

Co-authored-by: Dmitry Zhelnin <d.zhelnin@of-group.ru>
---
 src/Avalonia.Base/Animation/Animatable.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Base/Animation/Animatable.cs b/src/Avalonia.Base/Animation/Animatable.cs
index fb44c10f43..d67a9501da 100644
--- a/src/Avalonia.Base/Animation/Animatable.cs
+++ b/src/Avalonia.Base/Animation/Animatable.cs
@@ -123,8 +123,14 @@ namespace Avalonia.Animation
                         toAdd = newTransitions.Except(oldTransitions).ToList();
                     }
 
-                    newTransitions.CollectionChanged += TransitionsCollectionChangedHandler;
-                    _isSubscribedToTransitionsCollection = true;
+                    // Subscribe to collection changes only if transitions are already enabled,
+                    // i.e. control is attached to the visual tree
+                    if (_transitionsEnabled)
+                    {
+                        newTransitions.CollectionChanged += TransitionsCollectionChangedHandler;
+                        _isSubscribedToTransitionsCollection = true;
+                    }
+
                     AddTransitions(toAdd);
                 }