From d215dd99a0ea7a7456623e731b7a4c106d3410c9 Mon Sep 17 00:00:00 2001 From: Kyzentun Keeslala Date: Thu, 14 Jul 2016 18:12:59 -0600 Subject: [PATCH] Fix auto set style in course mode. --- src/ScreenSelectMusic.cpp | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp index d74ef75aa7..82f0784048 100644 --- a/src/ScreenSelectMusic.cpp +++ b/src/ScreenSelectMusic.cpp @@ -1894,11 +1894,23 @@ void ScreenSelectMusic::AfterMusicChange() { const Course *lCourse = m_MusicWheel.GetSelectedCourse(); const Style *pStyle = NULL; - if( CommonMetrics::AUTO_SET_STYLE ) - pStyle = pCourse->GetCourseStyle( GAMESTATE->m_pCurGame, GAMESTATE->GetNumSidesJoined() ); - if( pStyle == NULL ) + if(CommonMetrics::AUTO_SET_STYLE) + { + pStyle = pCourse->GetCourseStyle(GAMESTATE->m_pCurGame, GAMESTATE->GetNumPlayersEnabled()); + if(pStyle == NULL) + { + lCourse->GetAllTrails(m_vpTrails); + } + else + { + lCourse->GetTrails(m_vpTrails, pStyle->m_StepsType); + } + } + else + { pStyle = GAMESTATE->GetCurrentStyle(PLAYER_INVALID); - lCourse->GetTrails( m_vpTrails, pStyle->m_StepsType ); + lCourse->GetTrails(m_vpTrails, pStyle->m_StepsType); + } m_sSampleMusicToPlay = m_sCourseMusicPath; m_fSampleStartSeconds = 0;