From 95f896e68e6cb37a89b4f7567ccb7bf8330fce5a Mon Sep 17 00:00:00 2001
From: Charles Lohr <cnlohr@users.sourceforge.net>
Date: Fri, 13 Aug 2004 08:40:53 +0000
Subject: [PATCH] Oops... Fixed 100% all the time crash I made.

---
 stepmania/src/ScreenGameplay.cpp | 20 ++++++++++++--------
 stepmania/src/ScreenGameplay.h   |  2 ++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 6f5b2d8e04..a033ebc479 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -430,7 +430,7 @@ void ScreenGameplay::Init()
 		FOREACH_PlayerNumber(p)
 			if (!GAMESTATE->IsPlayerEnabled(p))
 				i=p;
-
+		m_ShowScoreboard=false;
 		if (i!=-1)
 		{
 			FOREACH_NSScoreBoardColumn (i2)
@@ -442,6 +442,7 @@ void ScreenGameplay::Init()
 				this->AddChild( &m_Scoreboard[i2] );
 				m_Scoreboard[i2].SetText(NSMAN->m_Scoreboard[i2]);
 				m_Scoreboard[i2].SetVertAlign(align_top);
+				m_ShowScoreboard=true;
 			}
 		}
 	}
@@ -1577,9 +1578,10 @@ void ScreenGameplay::Update( float fDeltaTime )
 			if( m_pLifeMeter[pn2] )
 				NSMAN->m_playerLife[pn2] = int(m_pLifeMeter[pn2]->GetLife()*10000);
 		}
-		FOREACH_NSScoreBoardColumn (cn)
-			if (NSMAN->ChangedScoreboard(cn))
-				m_Scoreboard[cn].SetText(NSMAN->m_Scoreboard[cn]);
+		if (m_ShowScoreboard)
+			FOREACH_NSScoreBoardColumn (cn)
+				if (NSMAN->ChangedScoreboard(cn))
+					m_Scoreboard[cn].SetText(NSMAN->m_Scoreboard[cn]);
 	}
 }
 
@@ -2364,8 +2366,9 @@ void ScreenGameplay::TweenOnScreen()
 		ON_COMMAND( m_DifficultyMeter[p] );
 	}
 
-	FOREACH_NSScoreBoardColumn( sc )
-		ON_COMMAND( m_Scoreboard[sc] );
+	if (m_ShowScoreboard)
+		FOREACH_NSScoreBoardColumn( sc )
+			ON_COMMAND( m_Scoreboard[sc] );
 
 	m_Overlay.PlayCommand("On");
 }
@@ -2406,8 +2409,9 @@ void ScreenGameplay::TweenOffScreen()
 	}
 	m_Overlay.PlayCommand("Off");
 
-	FOREACH_NSScoreBoardColumn( sc )
-		OFF_COMMAND( m_Scoreboard[sc] );
+	if (m_ShowScoreboard)
+		FOREACH_NSScoreBoardColumn( sc )
+			OFF_COMMAND( m_Scoreboard[sc] );
 
 	m_textDebug.StopTweening();
 	m_textDebug.BeginTweening( 1/8.f );
diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h
index b290c67fe3..eee0cc9e92 100644
--- a/stepmania/src/ScreenGameplay.h
+++ b/stepmania/src/ScreenGameplay.h
@@ -127,6 +127,8 @@ protected:
 	ActiveAttackList	m_ActiveAttackList[NUM_PLAYERS];
 	BitmapText			m_Scoreboard[NUM_NSSB_CATEGORIES];	// for NSMAN, so we can have a scoreboard
 
+	bool				m_ShowScoreboard;
+
 	BitmapText			m_textDebug;
 
 	RageTimer			m_GiveUpTimer;