From 509055d9f7945c740415dc06df05ab0dea82c9f8 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 19 Jul 2005 23:30:24 +0000 Subject: [PATCH] SONGMAN->Cleanup only in the Prepare code path. There's no point to doing it in the AddNewScreenToTop path. --- stepmania/src/ScreenManager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index 82e7d57997..76f4213a78 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -318,10 +318,6 @@ Screen* ScreenManager::MakeNewScreenInternal( const CString &sScreenName ) Screen* ScreenManager::MakeNewScreen( const CString &sScreenName ) { - /* Cleanup song data. This can free up a fair bit of memory, so do it before - * creating the new screen, to lower peak memory usage slightly. */ - SONGMAN->Cleanup(); - Screen* ret = MakeNewScreenInternal( sScreenName ); return ret; @@ -337,6 +333,10 @@ void ScreenManager::PrepareScreen( const CString &sScreenName ) return; } + /* Cleanup song data. This can free up a fair bit of memory, so do it before + * creating the new screen, to lower peak memory usage slightly. */ + SONGMAN->Cleanup(); + Screen* pNewScreen = MakeNewScreen(sScreenName); m_vPreparedScreens.push_back( pNewScreen );