only put the screen/background into g_pSharedBGA/g_ScreenStack in ActivatePreparedScreen; run start functions in LoadDelayedScreen
This commit is contained in:
@@ -667,14 +667,11 @@ bool ScreenManager::ActivatePreparedScreenAndBackground( const RString &sScreenN
|
|||||||
else
|
else
|
||||||
g_vPreparedBackgrounds.push_back( g_pSharedBGA );
|
g_vPreparedBackgrounds.push_back( g_pSharedBGA );
|
||||||
g_pSharedBGA = pNewBGA;
|
g_pSharedBGA = pNewBGA;
|
||||||
g_pSharedBGA->PlayCommand( "On" );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG->Trace("... PushScreen");
|
LOG->Trace("... PushScreen");
|
||||||
PushLoadedScreen( ls );
|
PushLoadedScreen( ls );
|
||||||
|
|
||||||
MESSAGEMAN->Broadcast( Message_ScreenChanged );
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -721,6 +718,9 @@ void ScreenManager::LoadDelayedScreen()
|
|||||||
AfterDeleteScreen();
|
AfterDeleteScreen();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
g_pSharedBGA->PlayCommand( "On" );
|
||||||
|
MESSAGEMAN->Broadcast( Message_ScreenChanged );
|
||||||
|
|
||||||
SendMessageToTopScreen( SM );
|
SendMessageToTopScreen( SM );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user