From e2a4d216790f3e0be65aff5535c37277a969e8bc Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 20 Mar 2004 17:46:25 +0000
Subject: [PATCH] sanity check fix m_sprMore in doubles

---
 stepmania/src/ScreenOptions.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 666af93a71..ebcd16b6f5 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -140,6 +140,10 @@ void ScreenOptions::Init( InputMode im, OptionRowData OptionRows[], int iNumOpti
 			m_Rows.push_back( new Row() );
 			Row &Row = *m_Rows[r];
 			Row.m_RowDef = OptionRows[r];
+			
+			if( !OptionRows[r].choices.size() )
+				RageException::Throw( "Screen %s menu entry \"%s\" has no choices",
+					m_sName.c_str(), OptionRows[r].name.c_str() );
 
 			for( int p=0; p<NUM_PLAYERS; p++ )
 			{
@@ -1107,7 +1111,7 @@ void ScreenOptions::OnChange( PlayerNumber pn )
 			TweenCursor( (PlayerNumber) p );
 
 		const bool ExitSelected = m_Rows[m_iCurrentRow[pn]]->Type == Row::ROW_EXIT;
-		if( p == pn || GAMESTATE->GetNumSidesJoined() == 1 )
+		if( p == pn || GAMESTATE->GetNumHumanPlayers() == 1 )
 		{
 			if( m_bWasOnExit[p] != ExitSelected )
 			{