From 040e76cecfc2e4eae2207f09ab6d54ecbfd104cf Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 20 Mar 2004 18:19:36 +0000 Subject: [PATCH] Don't change to SORT_SORT_MENU or SORT_MODE_MENU if they don't have at least two choices. --- stepmania/src/MusicWheel.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 747f3624c4..85f29a028c 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -1142,6 +1142,16 @@ bool MusicWheel::ChangeSort( SortOrder new_so ) // return true if change success if( GAMESTATE->m_SortOrder == new_so ) return false; + /* Don't change to SORT_SORT_MENU or SORT_MODE_MENU if they don't have at least + * two choices. */ + switch( new_so ) + { + case SORT_SORT_MENU: + case SORT_MODE_MENU: + if( m_WheelItemDatas[new_so].size() < 2 ) + return false; + } + switch( m_WheelState ) { case STATE_SELECTING_MUSIC: