From aef53c12251298d509959466acb5a93ac42371ce Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 14 Aug 2006 18:28:02 +0000 Subject: [PATCH] simplify indent --- stepmania/src/ScreenSelectMusic.cpp | 38 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 48bb17cf3a..471947c7b7 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -556,27 +556,25 @@ void ScreenSelectMusic::CheckBackgroundRequests( bool bForce ) { /* The CDTitle is normally very small, so we don't bother waiting to display it. */ RString sPath; - if( m_BackgroundLoader.IsCacheFileFinished(g_sCDTitlePath, sPath) ) - { - g_bCDTitleWaiting = false; - - RString sCDTitlePath = sPath; - - if( sCDTitlePath.empty() || !IsAFile(sCDTitlePath) ) - sCDTitlePath = g_bWantFallbackCdTitle? m_sFallbackCDTitlePath:RString(""); - - if( !sCDTitlePath.empty() ) - { - TEXTUREMAN->DisableOddDimensionWarning(); - m_sprCDTitleFront.Load( sCDTitlePath ); - m_sprCDTitleBack.Load( sCDTitlePath ); - TEXTUREMAN->EnableOddDimensionWarning(); - } - - m_BackgroundLoader.FinishedWithCachedFile( g_sCDTitlePath ); - } - else + if( !m_BackgroundLoader.IsCacheFileFinished(g_sCDTitlePath, sPath) ) return; + + g_bCDTitleWaiting = false; + + RString sCDTitlePath = sPath; + + if( sCDTitlePath.empty() || !IsAFile(sCDTitlePath) ) + sCDTitlePath = g_bWantFallbackCdTitle? m_sFallbackCDTitlePath:RString(""); + + if( !sCDTitlePath.empty() ) + { + TEXTUREMAN->DisableOddDimensionWarning(); + m_sprCDTitleFront.Load( sCDTitlePath ); + m_sprCDTitleBack.Load( sCDTitlePath ); + TEXTUREMAN->EnableOddDimensionWarning(); + } + + m_BackgroundLoader.FinishedWithCachedFile( g_sCDTitlePath ); } /* Loading the rest can cause small skips, so don't do it until the wheel settles.