Merge fun.

This commit is contained in:
Jason Felds
2013-05-30 22:20:19 -04:00
+2 -1
View File
@@ -885,7 +885,8 @@ bool ScreenSelectMusic::DetectCodes( const InputEventPlus &input )
{ {
if( GAMESTATE->IsAnExtraStageAndSelectionLocked() ) if( GAMESTATE->IsAnExtraStageAndSelectionLocked() )
m_soundLocked.Play(); m_soundLocked.Play();
else else if( !GAMESTATE->IsCourseMode() )
// Only change sorts in non-course mode
m_MusicWheel.NextSort(); m_MusicWheel.NextSort();
} }
else if( !GAMESTATE->IsAnExtraStageAndSelectionLocked() && CodeDetector::DetectAndAdjustMusicOptions(input.GameI.controller) ) else if( !GAMESTATE->IsAnExtraStageAndSelectionLocked() && CodeDetector::DetectAndAdjustMusicOptions(input.GameI.controller) )