From 012c3f5d4653a3e22c3c7088485bdf4225d153be Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 30 Jan 2006 07:18:34 +0000
Subject: [PATCH] always use ScreenMiniMenu::MiniMenu, not LoadMenu directly

---
 stepmania/src/ScreenMiniMenu.cpp | 13 ++++++-------
 stepmania/src/ScreenMiniMenu.h   |  3 ++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/stepmania/src/ScreenMiniMenu.cpp b/stepmania/src/ScreenMiniMenu.cpp
index 9419a84f01..bc72dd3aad 100644
--- a/stepmania/src/ScreenMiniMenu.cpp
+++ b/stepmania/src/ScreenMiniMenu.cpp
@@ -39,13 +39,12 @@ REGISTER_SCREEN_CLASS( ScreenMiniMenu );
 
 void ScreenMiniMenu::BeginScreen()
 {
-	if( g_pMenuDef != NULL )
-	{
-		LoadMenu( g_pMenuDef );
-		SetOKMessage( g_SendOnOK );
-		SetCancelMessage( g_SendOnCancel );
-		g_pMenuDef = NULL;
-	}
+	ASSERT( g_pMenuDef != NULL );
+
+	LoadMenu( g_pMenuDef );
+	SetOKMessage( g_SendOnOK );
+	SetCancelMessage( g_SendOnCancel );
+	g_pMenuDef = NULL;
 
 	ScreenOptions::BeginScreen();
 
diff --git a/stepmania/src/ScreenMiniMenu.h b/stepmania/src/ScreenMiniMenu.h
index 5f8e9eb809..527b117669 100644
--- a/stepmania/src/ScreenMiniMenu.h
+++ b/stepmania/src/ScreenMiniMenu.h
@@ -89,7 +89,6 @@ public:
 	static void MiniMenu( const MenuDef* pDef, ScreenMessage smSendOnOK, ScreenMessage smSendOnCancel = SM_None, float fX = 0, float fY = 0 );
 
 	void BeginScreen();
-	void LoadMenu( const MenuDef* pDef );
 	void HandleScreenMessage( const ScreenMessage SM );
 
 	void SetOKMessage( ScreenMessage SM_SendOnOK ) { m_SMSendOnOK = SM_SendOnOK; }
@@ -99,6 +98,8 @@ protected:
 	virtual void AfterChangeValueOrRow( PlayerNumber pn );
 	virtual void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
 	virtual void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
+
+	void LoadMenu( const MenuDef* pDef );
 	
 	ScreenMessage		m_SMSendOnOK;
 	ScreenMessage		m_SMSendOnCancel;