refactor and restore non-android bind hold behavior

This commit is contained in:
Mark W. Kidd 2019-01-02 21:24:33 -05:00
parent 96ea874850
commit 79264c7278

View File

@ -588,6 +588,16 @@ bool menu_input_key_bind_iterate(menu_input_ctx_bind_t *bind)
/*keep resetting bind during the hold period, or we'll potentially bind joystick and mouse, etc.*/
binds.buffer = *( binds.output );
if ( settings->uints.input_bind_timeout == 0 )
{
if ( ( binds.skip && !menu_input_binds.skip ) ||
menu_input_key_bind_poll_find_trigger( &menu_input_binds, &binds, &( binds.buffer ) ) )
{
complete = true;
}
}
else
{
if ( menu_input_key_bind_poll_find_hold( &binds, &binds.buffer ) )
{
/*inhibit timeout*/
@ -612,6 +622,7 @@ bool menu_input_key_bind_iterate(menu_input_ctx_bind_t *bind)
/*reset hold countdown*/
rarch_timer_begin_new_time( &binds.timer_hold, settings->uints.input_bind_hold );
}
}
if ( complete )
{