From 673421c753c4ab649a16ed24baa6da593f755070 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 14 Nov 2003 18:30:24 +0000
Subject: [PATCH] defer BPMDisplay load, so it has access to m_sName

---
 stepmania/src/BPMDisplay.cpp | 6 ++++--
 stepmania/src/BPMDisplay.h   | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/BPMDisplay.cpp b/stepmania/src/BPMDisplay.cpp
index 8474237d71..3bc1ccc6a2 100644
--- a/stepmania/src/BPMDisplay.cpp
+++ b/stepmania/src/BPMDisplay.cpp
@@ -31,20 +31,22 @@ BPMDisplay::BPMDisplay()
 	m_BPMS.push_back(0);
 	m_fPercentInState = 0;
 	m_fCycleTime = 1.0f;
+}
 
+void BPMDisplay::Load()
+{
 	m_textBPM.LoadFromNumbers( THEME->GetPathToN("BPMDisplay") );
 	m_textBPM.EnableShadow( false );
 	m_textBPM.SetHorizAlign( Actor::align_right );
 	m_textBPM.SetDiffuse( NORMAL_COLOR );
 	m_textBPM.SetXY( 0, 0 );
+	this->AddChild( &m_textBPM );
 
 	m_sprLabel.Load( THEME->GetPathToG("BPMDisplay label") );
 	m_sprLabel.EnableShadow( false );
 	m_sprLabel.SetDiffuse( NORMAL_COLOR );
 	m_sprLabel.SetHorizAlign( Actor::align_left );
 	m_sprLabel.SetXY( 0, 0 );
-
-	this->AddChild( &m_textBPM );
 	this->AddChild( &m_sprLabel );
 }
 
diff --git a/stepmania/src/BPMDisplay.h b/stepmania/src/BPMDisplay.h
index 0d9e2bebe5..72f6a5d3f1 100644
--- a/stepmania/src/BPMDisplay.h
+++ b/stepmania/src/BPMDisplay.h
@@ -23,6 +23,7 @@ class BPMDisplay : public ActorFrame
 {
 public:
 	BPMDisplay();
+	void Load();
 	virtual void Update( float fDeltaTime ); 
 	virtual void DrawPrimitives(); 
 	void SetBPM( const Song* pSong );