From 37b3705ffac457c7a6f8af314f95d8664c1f610f Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 19 Apr 2005 03:30:30 +0000
Subject: [PATCH] fix OneChoiceForAllPlayers options not being imported when
 only p2 is active

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

diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp
index 27fb6e0e75..a3b9bf87fa 100644
--- a/stepmania/src/OptionRow.cpp
+++ b/stepmania/src/OptionRow.cpp
@@ -221,10 +221,15 @@ CString OptionRow::GetRowTitle() const
 void OptionRow::AfterImportOptions()
 {
 	// Make all selections the same if bOneChoiceForAllPlayers
+	// Hack: we only import active players, so if only player 2 is imported,
+	// we need to copy p2 to p1, not p1 to p2.
 	if( m_RowDef.bOneChoiceForAllPlayers )
 	{
-		for( int p=1; p<NUM_PLAYERS; p++ )
-			m_vbSelected[p] = m_vbSelected[0];
+		PlayerNumber pnCopyFrom = GAMESTATE->m_MasterPlayerNumber;
+		if( GAMESTATE->m_MasterPlayerNumber == PLAYER_INVALID )
+			pnCopyFrom = PLAYER_1;
+		FOREACH_PlayerNumber( p )
+			m_vbSelected[p] = m_vbSelected[pnCopyFrom];
 	}
 
 	FOREACH_PlayerNumber( p )