From 74c973be2986fe733d5e5c4cad9859d2c2645118 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 26 Jun 2006 21:40:29 +0000 Subject: [PATCH] don't assert if the style changes between Init() and BeginScreen() --- stepmania/src/ScreenWithMenuElements.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenWithMenuElements.cpp b/stepmania/src/ScreenWithMenuElements.cpp index d9c16134c6..d11501aee7 100644 --- a/stepmania/src/ScreenWithMenuElements.cpp +++ b/stepmania/src/ScreenWithMenuElements.cpp @@ -159,10 +159,11 @@ void ScreenWithMenuElements::BeginScreen() void ScreenWithMenuElements::TweenOnScreen() { ON_COMMAND( m_autoHeader ); - if( STYLE_ICON && GAMESTATE->m_pCurStyle ) + + if( STYLE_ICON && !m_sprStyleIcon.GetName().empty() ) ON_COMMAND( m_sprStyleIcon ); - if( SHOW_STAGE && GAMESTATE->m_pCurStyle ) + if( SHOW_STAGE && !m_sprStage->GetName().empty() ) ON_COMMAND( m_sprStage ); if( MEMORY_CARD_ICONS )