fix "trapped on Exit in 3 key menu navigation"
This commit is contained in:
@@ -906,9 +906,6 @@ void ScreenOptions::ChangeValueInRow( PlayerNumber pn, int iDelta, bool Repeat )
|
|||||||
|
|
||||||
OptionRow &row = *m_Rows[iCurRow];
|
OptionRow &row = *m_Rows[iCurRow];
|
||||||
|
|
||||||
if( row.GetRowType() == OptionRow::ROW_EXIT ) // EXIT is selected
|
|
||||||
return; // don't allow a move
|
|
||||||
|
|
||||||
const int iNumChoices = row.GetRowDef().choices.size();
|
const int iNumChoices = row.GetRowDef().choices.size();
|
||||||
|
|
||||||
if( m_OptionsNavigation == NAV_THREE_KEY_MENU && iNumChoices <= 1 ) // 1 or 0
|
if( m_OptionsNavigation == NAV_THREE_KEY_MENU && iNumChoices <= 1 ) // 1 or 0
|
||||||
@@ -922,7 +919,7 @@ void ScreenOptions::ChangeValueInRow( PlayerNumber pn, int iDelta, bool Repeat )
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( iNumChoices == 0 )
|
if( iNumChoices <= 1 ) // nowhere to move
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if( Repeat && !ALLOW_REPEATING_CHANGE_VALUE_INPUT )
|
if( Repeat && !ALLOW_REPEATING_CHANGE_VALUE_INPUT )
|
||||||
|
|||||||
Reference in New Issue
Block a user