Fixing null dereferencing bug (#6866)

microsoft · Mar 22, 2022 · bf6a4d2 · bf6a4d2
1 parent 1697d94
commit bf6a4d2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/dev/AnimatedVisualPlayer/AnimatedVisualPlayer.cpp b/dev/AnimatedVisualPlayer/AnimatedVisualPlayer.cpp
@@ -809,15 +809,15 @@ void AnimatedVisualPlayer::OnAnimationOptimizationPropertyChanged(
 void AnimatedVisualPlayer::CreateAnimations() {
     m_createAnimationsCounter++;
 
-    if (m_isAnimationsCreated)
+    if (m_isAnimationsCreated || m_animatedVisual == nullptr || !SharedHelpers::IsRS5OrHigher())
     {
         return;
     }
 
     // Check if current animated visual supports creating animations and create them.
     if (const auto& animatedVisual = m_animatedVisual.get())
     {
-        if (const auto& animatedVisual2 = m_animatedVisual.try_as<winrt::IAnimatedVisual2>())
+        if (const auto& animatedVisual2 = animatedVisual.try_as<winrt::IAnimatedVisual2>())
         {
             animatedVisual2.CreateAnimations();
             m_isAnimationsCreated = true;
@@ -845,7 +845,7 @@ void AnimatedVisualPlayer::DestroyAnimations() {
             // Check if current animated visual supports destroyig animations.
             if (const auto& animatedVisual = m_animatedVisual.get())
             {
-                if (const auto& animatedVisual2 = m_animatedVisual.try_as<winrt::IAnimatedVisual2>())
+                if (const auto& animatedVisual2 = animatedVisual.try_as<winrt::IAnimatedVisual2>())
                 {
                     animatedVisual2.DestroyAnimations();
                     m_isAnimationsCreated = false;