From b1fdee1badbd92db21cd805d127fcccbc33db821 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 24 Jun 2006 00:50:08 +0000 Subject: [PATCH] move assert to the right place --- stepmania/src/ScreenManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index 95436ec604..2553faa4e3 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -512,6 +512,9 @@ Screen* ScreenManager::MakeNewScreen( const RString &sScreenName ) LOG->Trace( "Loaded '%s' ('%s') in %f", sScreenName.c_str(), sClassName.c_str(), t.GetDeltaTime() ); + // Screens may not call SetNewScreen from the ctor or Init(). + ASSERT_M( m_sDelayedScreen.empty(), m_sDelayedScreen ); + return ret; } @@ -634,9 +637,6 @@ Screen *ScreenManager::ActivatePreparedScreenAndBackground( const RString &sScre if( !GetPreppedScreen(sScreenName, ls) ) return NULL; - // Screens may not call SetNewScreen from the ctor or Init(). - ASSERT_M( m_sDelayedScreen.empty(), m_sDelayedScreen ); - // Find the prepared shared background (if any), and activate it. RString sNewBGA = THEME->GetPathB(sScreenName,"background"); if( sNewBGA != g_pSharedBGA->GetName() )