From aa1e0d1f76004b6cbf53a498c04a94779d766bc7 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 21 Mar 2005 05:16:28 +0000 Subject: [PATCH] fix stale pointer left in ActorFrame causes crash cancelling out of PlayerOptions --- stepmania/src/Transition.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/stepmania/src/Transition.cpp b/stepmania/src/Transition.cpp index 664f9bb113..87cbcdae13 100644 --- a/stepmania/src/Transition.cpp +++ b/stepmania/src/Transition.cpp @@ -16,14 +16,13 @@ void Transition::Load( CString sBGAniDir ) if( IsADirectory(sBGAniDir) && sBGAniDir.Right(1) != "/" ) sBGAniDir += "/"; - bool bWasLoaded = m_sprTransition.IsLoaded(); + this->RemoveAllChildren(); + m_sprTransition.Load( sBGAniDir ); m_sprTransition->PlayCommand( "On" ); + this->AddChild( m_sprTransition ); m_fLengthSeconds = m_sprTransition->GetTweenTimeLeft(); - if( !bWasLoaded ) - this->AddChild( m_sprTransition ); - m_State = waiting; // load sound from file specified by ini, or use the first sound in the directory