From b7ecf3776e0b5ae55dddf0bd195461b1c4338fa8 Mon Sep 17 00:00:00 2001
From: Charles Lohr <cnlohr@users.sourceforge.net>
Date: Wed, 2 Feb 2005 06:10:55 +0000
Subject: [PATCH] We need to know the name of the display before we cache
 metrics for it.

---
 stepmania/src/BPMDisplay.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/stepmania/src/BPMDisplay.cpp b/stepmania/src/BPMDisplay.cpp
index e7b6435172..06be8489e9 100644
--- a/stepmania/src/BPMDisplay.cpp
+++ b/stepmania/src/BPMDisplay.cpp
@@ -7,13 +7,7 @@
 #include "Course.h"
 #include "Style.h"
 
-BPMDisplay::BPMDisplay():
-	NORMAL_COLOR( m_sName, "NormalColor"),
-	CHANGE_COLOR( m_sName, "ChangeColor" ),
-	EXTRA_COLOR( m_sName, "ExtraColor" ),
-	CYCLE( m_sName, "Cycle" ),
-	SEPARATOR( m_sName, "Separator" ),
-	NO_BPM_TEXT( m_sName, "NoBPMText" )
+BPMDisplay::BPMDisplay()
 {
 	m_fBPMFrom = m_fBPMTo = 0;
 	m_iCurrentBPM = 0;
@@ -24,6 +18,13 @@ BPMDisplay::BPMDisplay():
 
 void BPMDisplay::Load()
 {
+	NORMAL_COLOR.Load( m_sName, "NormalColor");
+	CHANGE_COLOR.Load( m_sName, "ChangeColor" );
+	EXTRA_COLOR.Load( m_sName, "ExtraColor" );
+	CYCLE.Load( m_sName, "Cycle" );
+	SEPARATOR.Load( m_sName, "Separator" );
+	NO_BPM_TEXT.Load( m_sName, "NoBPMText" );
+
 	m_textBPM.SetName( "Text" );
 	m_textBPM.LoadFromFont( THEME->GetPathToF(m_sName) );
 	SET_XY_AND_ON_COMMAND( m_textBPM );