cleanup

stepmania/src/ScreenSelect.cpp

@@ -243,9 +243,6 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
 		 * here.(XXX: this should be done in a separate screen.) */
 		if( m_bTimeToFinalizePlayers )
 			GAMESTATE->PlayersFinalized();
-
-		SCREENMAN->SetNewScreen( m_sNextScreen );
-		return;
 	}
 
 	Screen::HandleScreenMessage( SM );

stepmania/src/ScreenSelect.h

@@ -25,6 +25,7 @@ public:
 	virtual void HandleMessage( const CString &sMessage );
 	
 	virtual void MenuBack( PlayerNumber pn );
+	virtual CString GetNextScreen() const { return m_sNextScreen; }
 
 protected:
 	virtual int GetSelectionIndex( PlayerNumber pn ) = 0;