From 0d74c0d864e91259b74bd5f57d6932367d641d84 Mon Sep 17 00:00:00 2001
From: Thad Ward <coderjoe@users.sourceforge.net>
Date: Sun, 24 Aug 2003 23:18:20 +0000
Subject: [PATCH] only initialize BeginnerHelper if we have a player who is on
 beginner and the option to show it is on.

---
 stepmania/src/ScreenGameplay.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 7deeece8ea..02e487372b 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -776,15 +776,19 @@ void ScreenGameplay::LoadNextSong()
 	/* Set up song-specific graphics. */
 	
 	
-	/* TODO: fall back on m_Background if nobody is on beginner. */
-	if( PREFSMAN->m_bShowBeginnerHelper )
-	{
-		// Beginner steps are always the same on both players.. Just get the # of 1 player that's using the Beginner steps, and go on.
-		m_iPOB = 0;
-		for( int pb=0; pb<NUM_PLAYERS; pb++ )
-			if( GAMESTATE->IsPlayerEnabled(pb) && GAMESTATE->m_PreferredDifficulty[pb] == DIFFICULTY_BEGINNER )
-					m_iPOB = pb;
+	bool UseBeginnerhelper = false;
+	// Beginner steps are always the same on both players.. Just get the # of 1 player that's using the Beginner steps, and go on.
+	m_iPOB = 0;
+	for( int pb=0; pb<NUM_PLAYERS; pb++ )
+		if( GAMESTATE->IsPlayerEnabled(pb) && GAMESTATE->m_PreferredDifficulty[pb] == DIFFICULTY_BEGINNER )
+		{
+			UseBeginnerhelper = true;
+			m_iPOB = pb;
+		}
 
+	/* TODO: fall back on m_Background if nobody is on beginner. */
+	if( PREFSMAN->m_bShowBeginnerHelper && UseBeginnerhelper)
+	{
 		m_Background.Unload();	// BeginnerHelper has it's own BG control.
 		m_Background.StopAnimating();