From 53368ac3964e1b919bfe02918a6ce10e12658488 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 7 Nov 2003 20:57:22 +0000
Subject: [PATCH] Remove extra m_sName.  Add assert.

---
 stepmania/src/MenuElements.cpp | 3 ++-
 stepmania/src/MenuElements.h   | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/MenuElements.cpp b/stepmania/src/MenuElements.cpp
index 3db324ebe0..0a343f5e75 100644
--- a/stepmania/src/MenuElements.cpp
+++ b/stepmania/src/MenuElements.cpp
@@ -42,7 +42,7 @@ void MenuElements::Load( CString sClassName )
 
 	ASSERT( this->m_SubActors.empty() );	// don't call Load twice!
 
-	m_sName = sClassName;
+	this->SetName( sClassName );
 
 	m_Background.LoadFromAniDir( THEME->GetPathToB(m_sName+" background") );
 	this->AddChild( &m_Background );
@@ -155,6 +155,7 @@ void MenuElements::DrawPrimitives()
 
 void MenuElements::DrawTopLayer()
 {
+	ASSERT( !this->m_SubActors.empty() );	// Load first
 	BeginDraw();
 
 	m_autoHeader->Draw();
diff --git a/stepmania/src/MenuElements.h b/stepmania/src/MenuElements.h
index 69906be1ba..be4e8b4c8f 100644
--- a/stepmania/src/MenuElements.h
+++ b/stepmania/src/MenuElements.h
@@ -43,9 +43,6 @@ public:
 	void StopTimer();
 
 public:	// let owner tinker with these objects
-
-	CString				m_sName;
-
 	BGAnimation			m_Background;
 
 	AutoActor			m_autoHeader;