only put the screen/background into g_pSharedBGA/g_ScreenStack in ActivatePreparedScreen; run start functions in LoadDelayedScreen

2006-06-24 01:21:21 +00:00
parent 3dbd1bec71
commit e61568e4cd
1 changed files with 3 additions and 3 deletions
@@ -667,14 +667,11 @@ bool ScreenManager::ActivatePreparedScreenAndBackground( const RString &sScreenN
 		else
 			g_vPreparedBackgrounds.push_back( g_pSharedBGA );
 		g_pSharedBGA = pNewBGA;
-		g_pSharedBGA->PlayCommand( "On" );
 	}

 	LOG->Trace("... PushScreen");
 	PushLoadedScreen( ls );

-	MESSAGEMAN->Broadcast( Message_ScreenChanged );
-
 	return true;
 }

@@ -721,6 +718,9 @@ void ScreenManager::LoadDelayedScreen()
 		AfterDeleteScreen();
 	}

+	g_pSharedBGA->PlayCommand( "On" );
+	MESSAGEMAN->Broadcast( Message_ScreenChanged );
+
 	SendMessageToTopScreen( SM );
 }