From 4593124978cdf9cf5818c3ee830f53bc2509d12f Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 17 Jan 2006 01:49:18 +0000 Subject: [PATCH] seems clearer this way --- stepmania/src/ScreenManager.cpp | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index cc3db224c9..729ba603a4 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -581,23 +581,20 @@ void ScreenManager::RunConcurrentlyPrepareScreen() m_OnDonePreparingScreen = SM_None; /* If the screen is already prepared, we're all set. */ - if( ScreenIsPrepped(sScreenName) ) + if( !ScreenIsPrepped(sScreenName) ) { - SendMessageToTopScreen( SM ); - return; + g_bIsConcurrentlyLoading = true; + StartConcurrentRendering(); + + if( g_setGroupedScreens.find(sScreenName) == g_setGroupedScreens.end() ) + DeletePreparedScreens(); + PrepareScreen( sScreenName ); + FinishConcurrentRendering(); + g_bIsConcurrentlyLoading = false; + + LOG->Trace( "Concurrent prepare of %s finished", sScreenName.c_str() ); } - g_bIsConcurrentlyLoading = true; - StartConcurrentRendering(); - - if( g_setGroupedScreens.find(sScreenName) == g_setGroupedScreens.end() ) - DeletePreparedScreens(); - PrepareScreen( sScreenName ); - FinishConcurrentRendering(); - g_bIsConcurrentlyLoading = false; - - LOG->Trace( "Concurrent prepare of %s finished", sScreenName.c_str() ); - /* We're done. Send the message. The screen is allowed to start * another concurrent prepare from this message. */ SendMessageToTopScreen( SM );