simplify (prep for a fix)

This commit is contained in:
Glenn Maynard
2005-10-13 05:10:52 +00:00
parent 4018c7be8b
commit c21b8ad7a9
+4 -1
View File
@@ -621,7 +621,10 @@ void ScreenManager::LoadDelayedScreen()
* data. */
bool bTimeToDeleteScreens = (g_setGroupedScreens.find(sScreenName) == g_setGroupedScreens.end());
if( bTimeToDeleteScreens && PREFSMAN->m_bDelayedScreenLoad )
{
bTimeToDeleteScreens = false;
DeletePreparedScreens();
}
// Load the screen, if it's not already prepared.
PrepareScreen( sScreenName );
@@ -681,7 +684,7 @@ void ScreenManager::LoadDelayedScreen()
if( bWasOnSystemMenu && !bIsOnSystemMenu )
PREFSMAN->SaveGlobalPrefsToDisk();
if( bTimeToDeleteScreens && !PREFSMAN->m_bDelayedScreenLoad )
if( bTimeToDeleteScreens )
DeletePreparedScreens();
LOG->Trace("... PushScreen");