From d2e4190a4e49efe7e2044d06f59a3014c705974f Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 18 Jul 2005 02:08:15 +0000
Subject: [PATCH] explicit load for MenuTimer, so we don't load anything if we
 don't want it

---
 stepmania/src/MenuTimer.cpp              | 3 +++
 stepmania/src/MenuTimer.h                | 1 +
 stepmania/src/ScreenNameEntry.cpp        | 1 +
 stepmania/src/ScreenWithMenuElements.cpp | 1 +
 4 files changed, 6 insertions(+)

diff --git a/stepmania/src/MenuTimer.cpp b/stepmania/src/MenuTimer.cpp
index cdced02014..c223f2cf00 100644
--- a/stepmania/src/MenuTimer.cpp
+++ b/stepmania/src/MenuTimer.cpp
@@ -27,7 +27,10 @@ MenuTimer::MenuTimer() :
 	m_fStallSeconds = 0;
 	m_fStallSecondsLeft = MAX_STALL_SECONDS;
 	m_bPaused = false;
+}
 
+void MenuTimer::Load()
+{
 	for( int i=0; i<NUM_MENU_TIMER_TEXTS; i++ )
 	{
 		m_text[i].LoadFromFont( THEME->GetPathF("MenuTimer","numbers") );
diff --git a/stepmania/src/MenuTimer.h b/stepmania/src/MenuTimer.h
index b6abd67bc9..a44687a4fa 100644
--- a/stepmania/src/MenuTimer.h
+++ b/stepmania/src/MenuTimer.h
@@ -15,6 +15,7 @@ class MenuTimer : public ActorFrame
 {
 public:
 	MenuTimer();
+	void Load();
 	
 	virtual void Update( float fDeltaTime ); 
 
diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp
index dc55b4d754..0071d3031b 100644
--- a/stepmania/src/ScreenNameEntry.cpp
+++ b/stepmania/src/ScreenNameEntry.cpp
@@ -244,6 +244,7 @@ ScreenNameEntry::ScreenNameEntry( CString sClassName ) : Screen( sClassName )
 	}
 
 
+	m_Timer.Load();
 	if( !PREFSMAN->m_bMenuTimer )
 		m_Timer.Disable();
 	else
diff --git a/stepmania/src/ScreenWithMenuElements.cpp b/stepmania/src/ScreenWithMenuElements.cpp
index 3ea51a8d6c..809543f0a4 100644
--- a/stepmania/src/ScreenWithMenuElements.cpp
+++ b/stepmania/src/ScreenWithMenuElements.cpp
@@ -92,6 +92,7 @@ void ScreenWithMenuElements::Init()
 	m_bTimerEnabled = (TIMER_SECONDS != -1);
 	if( m_bTimerEnabled )
 	{
+		m_MenuTimer->Load();
 		m_MenuTimer->SetName( "Timer" );
 		if( TIMER_STEALTH )
 			m_MenuTimer->EnableStealth( true );