From 8f5d2cc52d88b850404af9e11f791b41aad33225 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 25 Sep 2003 04:49:22 +0000
Subject: [PATCH] Fix ScreenSelectCharacter crash.

---
 stepmania/src/ScreenSelectCharacter.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp
index 8786b67e53..3a50b01081 100644
--- a/stepmania/src/ScreenSelectCharacter.cpp
+++ b/stepmania/src/ScreenSelectCharacter.cpp
@@ -63,24 +63,25 @@ ScreenSelectCharacter::ScreenSelectCharacter() : Screen("ScreenSelectCharacter")
 {	
 	LOG->Trace( "ScreenSelectCharacter::ScreenSelectCharacter()" );	
 
+	vector<Character*> apCharacters;
+	GAMESTATE->GetCharacters( apCharacters );
+	if(	apCharacters.empty() )
+	{
+		HandleScreenMessage( SM_GoToNextScreen );
+		return;
+	}
+
 	switch( GAMESTATE->m_PlayMode )
 	{
-	//
 	// For Rave/Battle mode, we force the players to select characters
 	// (by not returning in this switch)
-	//
 	case PLAY_MODE_BATTLE:
 	case PLAY_MODE_RAVE:
 		break;
 
-	//
-	// Non Rave/Battle mode, just skip this screen if there are no
-	// characters or if this screen should be hidden
-	//
 	default:
-		vector<Character*> apCharacters;
-		GAMESTATE->GetCharacters( apCharacters );
-		if(	apCharacters.empty() || PREFSMAN->m_ShowDancingCharacters != PrefsManager::CO_SELECT )
+		/* Non Rave/Battle mode, just skip this screen if disabled. */
+		if(	PREFSMAN->m_ShowDancingCharacters != PrefsManager::CO_SELECT )
 		{
 			HandleScreenMessage( SM_GoToNextScreen );
 			return;