From e73d3c33c324e63bdee2e8dc9b064239caee0271 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Sun, 8 Jan 2012 21:39:58 -0500
Subject: [PATCH] Partial fix for music wheel woes.

---
 src/MusicWheel.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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<MusicWheelItemData *> &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();
 	}