diff --git a/src/MusicWheel.cpp b/src/MusicWheel.cpp index 7ced369c24..014b8981a0 100644 --- a/src/MusicWheel.cpp +++ b/src/MusicWheel.cpp @@ -982,6 +982,13 @@ void MusicWheel::FilterWheelItemDatas(vector &aUnFilteredD aiRemove[i] = true; continue; } + + // if AutoSetStyle, make sure the song is playable in the end. + if (CommonMetrics::AUTO_SET_STYLE && !SongUtil::IsSongPlayable(pSong)) + { + aiRemove[i] = true; + continue; + } } if( WID.m_Type == WheelItemDataType_Course ) @@ -1506,7 +1513,7 @@ void MusicWheel::PlayerJoined() { if(m_WheelItemDatasStatus[GAMESTATE->m_SortOrder]!=INVALID) m_WheelItemDatasStatus[GAMESTATE->m_SortOrder]=NEEDREFILTER; - + RebuildWheelItems(); }