From e2086bcb5bd2cbd81e3ca05c53ddc8035de20184 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 18 Jul 2005 03:41:15 +0000
Subject: [PATCH] import options in ScreenOptions::BeginScreen, not
 ScreenOptions::InitMenu, so we'll re-import if the screen is re-pushed

---
 stepmania/src/ScreenOptions.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 27f481bd0c..58c7962a4c 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -202,7 +202,7 @@ void ScreenOptions::SetOptionIcon( PlayerNumber pn, int iRow, CString sText, Gam
 
 void ScreenOptions::InitMenu( const vector<OptionRowDefinition> &vDefs, const vector<OptionRowHandler*> &vHands )
 {
-	LOG->Trace( "ScreenOptions::Set()" );
+	LOG->Trace( "ScreenOptions::InitMenu()" );
 
 	ASSERT( vDefs.size() == vHands.size() );
 
@@ -222,15 +222,6 @@ void ScreenOptions::InitMenu( const vector<OptionRowDefinition> &vDefs, const ve
 
 		row.LoadNormal( def, hand, bFirstRowGoesDown );
 		row.InitText();
-
-		vector<PlayerNumber> vpns;
-		FOREACH_HumanPlayer( p )
-			vpns.push_back( p );
-		this->ImportOptions( r, vpns );
-	
-		CHECKPOINT_M( ssprintf("row %i: %s", r, row.GetRowDef().m_sName.c_str()) );
-
-		row.AfterImportOptions();
 	}
 
 	if( SHOW_EXIT_ROW )
@@ -242,7 +233,6 @@ void ScreenOptions::InitMenu( const vector<OptionRowDefinition> &vDefs, const ve
 		row.InitText();
 		row.SetDrawOrder( 1 );
 		m_framePage.AddChild( &row );
-		row.AfterImportOptions();
 	}
 
 	m_framePage.SortByDrawOrder();
@@ -260,6 +250,17 @@ void ScreenOptions::BeginScreen()
 {
 	ScreenWithMenuElements::BeginScreen();
 
+	for( unsigned r=0; r<m_pRows.size(); r++ )		// foreach row
+	{
+		vector<PlayerNumber> vpns;
+		FOREACH_HumanPlayer( p )
+			vpns.push_back( p );
+		this->ImportOptions( r, vpns );
+	
+		OptionRow *pRow = m_pRows[r];
+		pRow->AfterImportOptions();
+	}
+
 	ON_COMMAND( m_framePage );
 
 	m_bMoreShown = false;