From 7deffd2de4a900356877c7d2f470cb579ce5065e Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 31 Jul 2003 22:48:49 +0000
Subject: [PATCH] Fix GetGroupColor ignoring the theme.

---
 stepmania/src/SongManager.cpp | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index af58a65af8..f1e7ed992c 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -53,8 +53,18 @@ const int COURSE_SCORES_VERSION = 1;
 #define EXTRA_COLOR			THEME->GetMetricC("SongManager","ExtraColor")
 
 vector<RageColor> g_vGroupColors;
-RageColor g_ExtraColor;
+RageTimer g_LastMetricUpdate; /* can't use RageTimer globally */
 
+static void UpdateMetrics()
+{
+	if( g_LastMetricUpdate.PeekDeltaTime() < 1 )
+		return;
+
+	g_LastMetricUpdate.Touch();
+	g_vGroupColors.clear();
+	for( int i=0; i<NUM_GROUP_COLORS; i++ )
+		g_vGroupColors.push_back( GROUP_COLOR(i) );
+}
 
 SongManager::SongManager( LoadingWindow *ld )
 {
@@ -63,11 +73,6 @@ SongManager::SongManager( LoadingWindow *ld )
 	SONGMAN = this;
 	try
 	{
-		g_vGroupColors.clear();
-		for( int i=0; i<NUM_GROUP_COLORS; i++ )
-			g_vGroupColors.push_back( GROUP_COLOR(i) );
-		g_ExtraColor = EXTRA_COLOR;
-
 		InitSongArrayFromDisk( ld );
 		InitCoursesFromDisk();
 		InitAutogenCourses();
@@ -77,6 +82,9 @@ SongManager::SongManager( LoadingWindow *ld )
 		SONGMAN = NULL;
 		throw;
 	}
+
+	g_LastMetricUpdate.SetZero();
+	UpdateMetrics();
 }
 
 SongManager::~SongManager()
@@ -611,6 +619,8 @@ bool SongManager::DoesGroupExist( CString sGroupName )
 
 RageColor SongManager::GetGroupColor( const CString &sGroupName )
 {
+	UpdateMetrics();
+
 	// search for the group index
 	unsigned i;
 	for( i=0; i<m_arrayGroupNames.size(); i++ )