From cb39a7d093b7ae75bc887c0170e0667b31815e90 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Tue, 28 Mar 2006 21:29:32 +0000
Subject: [PATCH] fix assert b/c rowCode not set when navigating mini menu with
 P2

---
 stepmania/src/ScreenMiniMenu.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/ScreenMiniMenu.cpp b/stepmania/src/ScreenMiniMenu.cpp
index cab35e1fe4..3face77541 100644
--- a/stepmania/src/ScreenMiniMenu.cpp
+++ b/stepmania/src/ScreenMiniMenu.cpp
@@ -115,6 +115,11 @@ void ScreenMiniMenu::AfterChangeValueOrRow( PlayerNumber pn )
 	vpns.push_back( GAMESTATE->m_MasterPlayerNumber );
 	for( unsigned i=0; i<m_pRows.size(); i++ )
 		ExportOptions( i, vpns );
+	
+	{
+		int iCurRow = GetCurrentRow( pn );
+		s_iLastRowCode = m_vMenuRows[iCurRow].iRowCode;
+	}
 
 	// Changing one option can affect whether other options are available.
 	for( unsigned i=0; i<m_pRows.size(); i++ )
@@ -141,8 +146,6 @@ void ScreenMiniMenu::ImportOptions( int r, const vector<PlayerNumber> &vpns )
 
 void ScreenMiniMenu::ExportOptions( int r, const vector<PlayerNumber> &vpns )
 {
-	if( r == GetCurrentRow() )
-		s_iLastRowCode = m_vMenuRows[r].iRowCode;
 	s_viLastAnswers.resize( m_vMenuRows.size() );
 	s_viLastAnswers[r] = m_pRows[r]->GetOneSharedSelection( true );
 }