From c1a2276330807cc3ef94a4fc280703e274f5d636 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 23 Jul 2005 06:13:33 +0000
Subject: [PATCH] UpdateDisqualified in BeginScreen, not Init; in Init we
 havn't imported options yet, so UpdateDisqualified applies defaults

---
 stepmania/src/ScreenPlayerOptions.cpp | 15 +++++++++++----
 stepmania/src/ScreenPlayerOptions.h   |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index d4abaeeedd..30e0be13fa 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -56,17 +56,24 @@ void ScreenPlayerOptions::Init()
 
 	SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("player options intro") );
 
+	this->SortByDrawOrder();
+
+	FOREACH_PlayerNumber( p )
+		m_bRowCausesDisqualified[p].resize( m_pRows.size(), false );
+}
+
+
+void ScreenPlayerOptions::BeginScreen()
+{
+	ScreenOptionsMaster::BeginScreen();
+
 	FOREACH_HumanPlayer( p )
 	{
-		m_bRowCausesDisqualified[p].resize( m_pRows.size(), false );
 		for( unsigned r=0; r<m_pRows.size(); r++ )
 			UpdateDisqualified( r, p );
 	}
-
-	this->SortByDrawOrder();
 }
 
-
 void ScreenPlayerOptions::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
 {
 	if( m_bAskOptionsMessage &&
diff --git a/stepmania/src/ScreenPlayerOptions.h b/stepmania/src/ScreenPlayerOptions.h
index 89315b14fe..571abf5180 100644
--- a/stepmania/src/ScreenPlayerOptions.h
+++ b/stepmania/src/ScreenPlayerOptions.h
@@ -9,6 +9,7 @@ class ScreenPlayerOptions : public ScreenOptionsMaster
 public:
 	ScreenPlayerOptions( CString sName );
 	virtual void Init();
+	virtual void BeginScreen();
 
 	virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
 	virtual void HandleScreenMessage( const ScreenMessage SM );