Changed SetCurrentStyle to unjoin other player when setting OnePlayerTwoSides to fix crash from second joining on SSS and picking double. Changed MusicWheel FilterWheelItemDatas to clear the vector it's putting the filtered data in instead of appending to the end. Updated Polish translation.

2015-02-08 10:33:51 -07:00
parent 1de3cce1cd
commit 65a1551c6d
4 changed files with 3042 additions and 2715 deletions
@@ -1446,7 +1446,16 @@ void GameState::SetCurrentStyle(const Style *style, PlayerNumber pn)
 	if(INPUTMAPPER)
 	{
 		if(GetCurrentStyle(pn) && GetCurrentStyle(pn)->m_StyleType == StyleType_OnePlayerTwoSides)
+		{
+			// If the other player is joined, unjoin them because this style only
+			// allows one player.
+			PlayerNumber other_pn= OPPOSITE_PLAYER[this->GetMasterPlayerNumber()];
+			if(GetNumSidesJoined() > 1)
+			{
+				UnjoinPlayer(other_pn);
+			}
 			INPUTMAPPER->SetJoinControllers(this->GetMasterPlayerNumber());
+		}
 		else
 			INPUTMAPPER->SetJoinControllers(PLAYER_INVALID);
 	}