From c02f7700d9c3f7d390f1b49a31cfe942812b99b9 Mon Sep 17 00:00:00 2001
From: Andrew Wong <curewater@users.sourceforge.net>
Date: Sun, 31 Aug 2003 03:49:19 +0000
Subject: [PATCH] fix nonstop/oni modes (course sort was being overridden by
 metrics)

---
 stepmania/src/MusicWheel.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index 5784137f7f..ae1f443c18 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -389,10 +389,14 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
 			for( unsigned j = 0; so == SORT_INVALID && j < parts.size(); ++j )
 				so = StringToSongSortOrder( parts[j] );
 
-			// If we have a valid default sort in metrics, select it.
-			so = StringToSongSortOrder(DEFAULT_SORT);
-			if( so != SORT_INVALID )
-				GAMESTATE->m_SongSortOrder = so;
+			if ( !GAMESTATE->IsCourseMode() )
+			{	
+				// If we have a valid default sort in metrics, select it.
+				// BUT ONLY IF WE ARE NOT IN COURSE MODE
+				so = StringToSongSortOrder(DEFAULT_SORT);
+				if( so != SORT_INVALID )
+					GAMESTATE->m_SongSortOrder = so;
+			}
 
 			if( so == SORT_INVALID )
 				so = SORT_GROUP;