Skip to content

Commit 7ddf7d8

Browse files
committed
set input_block_timeout default value to 1
1 parent 14b1002 commit 7ddf7d8

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

config.def.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1637,6 +1637,11 @@
16371637
* resuming content */
16381638
#define DEFAULT_INPUT_AUTO_GAME_FOCUS AUTO_GAME_FOCUS_OFF
16391639

1640+
/* Make simultaneous buttons easier to hit on Android */
1641+
#if defined(ANDROID)
1642+
#define DEFAULT_INPUT_BLOCK_TIMEOUT 1
1643+
#endif
1644+
16401645
/* Show the input descriptors set by the core instead
16411646
* of the default ones. */
16421647
#define DEFAULT_INPUT_DESCRIPTOR_LABEL_SHOW true

configuration.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2582,7 +2582,7 @@ static struct config_uint_setting *populate_settings_uint(
25822582
SETTING_UINT("input_rumble_gain", &settings->uints.input_rumble_gain, true, DEFAULT_RUMBLE_GAIN, false);
25832583
SETTING_UINT("input_auto_game_focus", &settings->uints.input_auto_game_focus, true, DEFAULT_INPUT_AUTO_GAME_FOCUS, false);
25842584
#ifdef ANDROID
2585-
SETTING_UINT("input_block_timeout", &settings->uints.input_block_timeout, true, 0, false);
2585+
SETTING_UINT("input_block_timeout", &settings->uints.input_block_timeout, true, DEFAULT_INPUT_BLOCK_TIMEOUT, false);
25862586
#endif
25872587
SETTING_UINT("keyboard_gamepad_mapping_type", &settings->uints.input_keyboard_gamepad_mapping_type, true, 1, false);
25882588

menu/menu_setting.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16903,7 +16903,7 @@ static bool setting_append_list(
1690316903
&settings->uints.input_block_timeout,
1690416904
MENU_ENUM_LABEL_INPUT_BLOCK_TIMEOUT,
1690516905
MENU_ENUM_LABEL_VALUE_INPUT_BLOCK_TIMEOUT,
16906-
0,
16906+
DEFAULT_INPUT_BLOCK_TIMEOUT,
1690716907
&group_info,
1690816908
&subgroup_info,
1690916909
parent_group,

0 commit comments

Comments
 (0)