From 8afaed1ce068d3797c5373bf564f96072e02aeb2 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 25 Jan 2006 06:19:29 +0000
Subject: [PATCH] cleanup

---
 stepmania/src/ScreenManager.cpp | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp
index 187e9678f5..bc51e603fa 100644
--- a/stepmania/src/ScreenManager.cpp
+++ b/stepmania/src/ScreenManager.cpp
@@ -692,20 +692,13 @@ void ScreenManager::LoadDelayedScreen()
 	vector<Actor*> apActorsToDelete;
 	if( bTimeToDeleteScreens && !ScreenIsPrepped(sScreenName) )
 	{
+		/* It's time to delete all old prepared screens.  Depending on DelayedScreenLoad,
+		 * we can either delete the screens before or after we load the new screen.  Either
+		 * way, we must remove them from the prepared list before we prepare new screens. */
 		if( PREFSMAN->m_bDelayedScreenLoad )
-		{
 			DeletePreparedScreens();
-		}
 		else
-		{
-			/* Since DelayedScreenLoad is false, we want to keep the
-			 * old screens in memory until we finish loading the new
-			 * ones, in order to prevent unloading assets and then
-			 * immediately reloading them.  However, since the
-			 * screen isn't in the current group, we must remove
-			 * it from the pool before loading the new screen. */
 			GrabPreparedActors( apActorsToDelete );
-		}
 	}
 
 	// Load the screen, if it's not already prepared.