From d80af5bf42fc27a58c2c46087756daf348d2b1e0 Mon Sep 17 00:00:00 2001 From: "Devin J. Pohly" Date: Tue, 1 Jan 2013 14:32:22 -0500 Subject: [PATCH] fix assertion when multiple players press start simultaneously --- src/ScreenSelectMaster.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/ScreenSelectMaster.cpp b/src/ScreenSelectMaster.cpp index 9b670e11ac..c5f45b3b69 100644 --- a/src/ScreenSelectMaster.cpp +++ b/src/ScreenSelectMaster.cpp @@ -783,7 +783,17 @@ void ScreenSelectMaster::MenuStart( const InputEventPlus &input ) if( m_fLockInputSecs > 0 ) return; - if( m_bChosen[pn] ) + if( SHARED_SELECTION || GetCurrentPage() == PAGE_2 ) + { + // Return if any player has chosen + FOREACH_EnabledPlayer( p ) + { + if( m_bChosen[p] ) + return; + } + } + else if( m_bChosen[pn] ) + // Return if this player has already chosen return; if( !ProcessMenuStart( pn ) )