From c0df23630677227be710e8072e7f448a1f3f93d4 Mon Sep 17 00:00:00 2001
From: Josh Allen <axlecrusher@users.sourceforge.net>
Date: Sun, 13 Aug 2006 22:22:44 +0000
Subject: [PATCH] SetName before calling Load()

---
 stepmania/src/RoomWheel.cpp            | 3 ++-
 stepmania/src/ScreenNetSelectMusic.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/RoomWheel.cpp b/stepmania/src/RoomWheel.cpp
index e6d6722df2..dcc56ca7ce 100644
--- a/stepmania/src/RoomWheel.cpp
+++ b/stepmania/src/RoomWheel.cpp
@@ -17,9 +17,10 @@ RoomWheel::~RoomWheel()
 
 void RoomWheel::Load( RString sType ) 
 {
+	SetName( sType );
+
 	WheelBase::Load( sType );
 
-	SetName( sType );
 	m_offset = 0;
 	LOG->Trace( "RoomWheel::Load('%s')", sType.c_str() );
 
diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp
index 233c853321..5d7c5c0b0e 100644
--- a/stepmania/src/ScreenNetSelectMusic.cpp
+++ b/stepmania/src/ScreenNetSelectMusic.cpp
@@ -73,8 +73,8 @@ void ScreenNetSelectMusic::Init()
 		this->AddChild( &m_DifficultyMeters[p] );
 	}
 
-	m_MusicWheel.Load( "MusicWheel" );
 	m_MusicWheel.SetName( "MusicWheel" );
+	m_MusicWheel.Load( "MusicWheel" );
 	SET_XY( m_MusicWheel );
 	m_MusicWheel.BeginScreen();
 	ON_COMMAND( m_MusicWheel );