Skip to content

Commit bf6a4d2

Browse files
authored
Fixing null dereferencing bug (#6866)
1 parent 1697d94 commit bf6a4d2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

dev/AnimatedVisualPlayer/AnimatedVisualPlayer.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -809,15 +809,15 @@ void AnimatedVisualPlayer::OnAnimationOptimizationPropertyChanged(
809809
void AnimatedVisualPlayer::CreateAnimations() {
810810
m_createAnimationsCounter++;
811811

812-
if (m_isAnimationsCreated)
812+
if (m_isAnimationsCreated || m_animatedVisual == nullptr || !SharedHelpers::IsRS5OrHigher())
813813
{
814814
return;
815815
}
816816

817817
// Check if current animated visual supports creating animations and create them.
818818
if (const auto& animatedVisual = m_animatedVisual.get())
819819
{
820-
if (const auto& animatedVisual2 = m_animatedVisual.try_as<winrt::IAnimatedVisual2>())
820+
if (const auto& animatedVisual2 = animatedVisual.try_as<winrt::IAnimatedVisual2>())
821821
{
822822
animatedVisual2.CreateAnimations();
823823
m_isAnimationsCreated = true;
@@ -845,7 +845,7 @@ void AnimatedVisualPlayer::DestroyAnimations() {
845845
// Check if current animated visual supports destroyig animations.
846846
if (const auto& animatedVisual = m_animatedVisual.get())
847847
{
848-
if (const auto& animatedVisual2 = m_animatedVisual.try_as<winrt::IAnimatedVisual2>())
848+
if (const auto& animatedVisual2 = animatedVisual.try_as<winrt::IAnimatedVisual2>())
849849
{
850850
animatedVisual2.DestroyAnimations();
851851
m_isAnimationsCreated = false;

0 commit comments

Comments
 (0)