From 072f096214e23a19f6ad03987081a8151f39faed Mon Sep 17 00:00:00 2001 From: Marcio Barrientos Date: Mon, 26 Nov 2012 15:16:00 -0600 Subject: [PATCH] Only unchose steps if menutimer have more than 10 seconds, twoparttimerseconds and allowing to unchose the song makes a "infinite timer" bug --- src/ScreenSelectMusic.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp index d3ca292f7b..52e4e7a4f8 100644 --- a/src/ScreenSelectMusic.cpp +++ b/src/ScreenSelectMusic.cpp @@ -845,13 +845,16 @@ void ScreenSelectMusic::Input( const InputEventPlus &input ) else { // XXX: should this be called "TwoPartCancelled"? - Message msg("SongUnchosen"); - msg.SetParam( "Player", input.pn ); - MESSAGEMAN->Broadcast( msg ); - // unset all steps - FOREACH_ENUM( PlayerNumber , p ) - m_bStepsChosen[p] = false; - m_SelectionState = SelectionState_SelectingSong; + float fSeconds = m_MenuTimer->GetSeconds(); + if( fSeconds > 10 ) { + Message msg("SongUnchosen"); + msg.SetParam( "Player", input.pn ); + MESSAGEMAN->Broadcast( msg ); + // unset all steps + FOREACH_ENUM( PlayerNumber , p ) + m_bStepsChosen[p] = false; + m_SelectionState = SelectionState_SelectingSong; + } } } }