simplify (prep for a fix)
This commit is contained in:
@@ -621,7 +621,10 @@ void ScreenManager::LoadDelayedScreen()
|
|||||||
* data. */
|
* data. */
|
||||||
bool bTimeToDeleteScreens = (g_setGroupedScreens.find(sScreenName) == g_setGroupedScreens.end());
|
bool bTimeToDeleteScreens = (g_setGroupedScreens.find(sScreenName) == g_setGroupedScreens.end());
|
||||||
if( bTimeToDeleteScreens && PREFSMAN->m_bDelayedScreenLoad )
|
if( bTimeToDeleteScreens && PREFSMAN->m_bDelayedScreenLoad )
|
||||||
|
{
|
||||||
|
bTimeToDeleteScreens = false;
|
||||||
DeletePreparedScreens();
|
DeletePreparedScreens();
|
||||||
|
}
|
||||||
|
|
||||||
// Load the screen, if it's not already prepared.
|
// Load the screen, if it's not already prepared.
|
||||||
PrepareScreen( sScreenName );
|
PrepareScreen( sScreenName );
|
||||||
@@ -681,7 +684,7 @@ void ScreenManager::LoadDelayedScreen()
|
|||||||
if( bWasOnSystemMenu && !bIsOnSystemMenu )
|
if( bWasOnSystemMenu && !bIsOnSystemMenu )
|
||||||
PREFSMAN->SaveGlobalPrefsToDisk();
|
PREFSMAN->SaveGlobalPrefsToDisk();
|
||||||
|
|
||||||
if( bTimeToDeleteScreens && !PREFSMAN->m_bDelayedScreenLoad )
|
if( bTimeToDeleteScreens )
|
||||||
DeletePreparedScreens();
|
DeletePreparedScreens();
|
||||||
|
|
||||||
LOG->Trace("... PushScreen");
|
LOG->Trace("... PushScreen");
|
||||||
|
|||||||
Reference in New Issue
Block a user