From 8f062f9f0f12475fa3a234b89c1adacb28b688bb Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 26 Apr 2005 06:15:45 +0000 Subject: [PATCH] fix: pressing start while tweening to the sort menu would select a song; this would cause GAMESTATE->m_SortOrder to be set to SORT_MODE_MENU while in gameplay, which is wrong --- stepmania/src/MusicWheel.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 24d6bd4480..e323753aec 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -1302,8 +1302,12 @@ bool MusicWheel::Select() // return true if this selection ends the screen { LOG->Trace( "MusicWheel::Select()" ); - if( m_WheelState == STATE_ROULETTE_SLOWING_DOWN ) + switch( m_WheelState ) + { + case STATE_FLYING_OFF_BEFORE_NEXT_SORT: + case STATE_ROULETTE_SLOWING_DOWN: return false; + } m_Moving = 0;