From 008c4454ce77e9b9aad9aed90df4e40907d9b9f8 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 4 Apr 2009 18:30:33 +0000 Subject: [PATCH] fix assert backing out from SSCourse --- stepmania/src/BPMDisplay.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stepmania/src/BPMDisplay.cpp b/stepmania/src/BPMDisplay.cpp index 83bc74c3d6..c431fe5624 100644 --- a/stepmania/src/BPMDisplay.cpp +++ b/stepmania/src/BPMDisplay.cpp @@ -242,7 +242,10 @@ void BPMDisplay::SetFromGameState() } if( GAMESTATE->m_pCurCourse.Get() ) { - SetBpmFromCourse( GAMESTATE->m_pCurCourse ); + if( GAMESTATE->GetCurrentStyle() == NULL ) + ; // This is true when backing out from ScreenSelectCourse to ScreenTitleMenu. So, don't call SetBpmFromCourse where an assert will fire. + else + SetBpmFromCourse( GAMESTATE->m_pCurCourse ); return; }