From f56cea11aae61a1f001c21f8d50555917efc1078 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sun, 16 Oct 2005 01:04:55 +0000
Subject: [PATCH] Fix "style,single;song,foo;steps,fum;screen,ScreenFoo"
 causing an assert in GetAndClearScreen.  We can't LoadOne each part without
 actually applying each first; "steps" will fail due to style and song not
 actually having been set.

---
 stepmania/src/GameCommand.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp
index 608a9de324..ea322674a6 100644
--- a/stepmania/src/GameCommand.cpp
+++ b/stepmania/src/GameCommand.cpp
@@ -688,12 +688,10 @@ CString GameCommand::GetAndClearScreen()
 	CString sRet;
 	FOREACH( Command, m_Commands.v, cmd )
 	{
-		GameCommand gc;
-		gc.m_bInvalid = false;
-		gc.LoadOne( *cmd );
-		if( gc.m_sScreen != "" )
+		CString sName = cmd->GetName();
+		if( sName == "screen" )
 		{
-			sRet = gc.m_sScreen;
+			sRet = cmd->GetArg(1);
 			m_Commands.v.erase( cmd );
 			break;
 		}