From 9e6d16174317f543be743758685e69b8afca289b Mon Sep 17 00:00:00 2001 From: "Devin J. Pohly" Date: Wed, 2 Jan 2013 14:07:03 -0500 Subject: [PATCH] fix crash on double ES. code should ensure that a call to SetCurrentSteps passes steps that match the current StyleType --- src/GameState.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GameState.cpp b/src/GameState.cpp index 0273b6ece8..250625d262 100644 --- a/src/GameState.cpp +++ b/src/GameState.cpp @@ -2223,7 +2223,7 @@ public: PlayerNumber pn = Enum::Check(L, 1); if( lua_isnil(L,2) ) { p->m_pCurSteps[pn].Set( NULL ); } else { Steps *pS = Luna::check(L,2); p->m_pCurSteps[pn].Set( pS ); } - GAMESTATE->SetCurrentStyle( GAMEMAN->GetFirstCompatibleStyle( GAMESTATE->m_pCurGame, GAMESTATE->GetNumSidesJoined(), p->m_pCurSteps[pn]->m_StepsType )); + ASSERT(p->m_pCurSteps[pn]->m_StepsType == p->m_pCurStyle->m_StepsType); // Why Broadcast again? This is double-broadcasting. -Chris MESSAGEMAN->Broadcast( (MessageID)(Message_CurrentStepsP1Changed+pn) );