From e5c6032d376af59a0e80c5138a2bef5cb5879112 Mon Sep 17 00:00:00 2001 From: Tony Jansson Date: Wed, 11 Nov 2020 15:08:09 +0200 Subject: [PATCH] Refresh turbo button selection in 'Single Mode' --- menu/cbs/menu_cbs_sublabel.c | 2 +- retroarch.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index e8a0b9c864..030d008a98 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -329,7 +329,7 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_mouse_scale, MENU_ENUM_SUBLABE DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_axis_threshold, MENU_ENUM_SUBLABEL_INPUT_BUTTON_AXIS_THRESHOLD) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_turbo_period, MENU_ENUM_SUBLABEL_INPUT_TURBO_PERIOD) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_duty_cycle, MENU_ENUM_SUBLABEL_INPUT_DUTY_CYCLE) - DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_turbo_mode, MENU_ENUM_SUBLABEL_INPUT_TURBO_MODE) +DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_turbo_mode, MENU_ENUM_SUBLABEL_INPUT_TURBO_MODE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_turbo_default_button, MENU_ENUM_SUBLABEL_INPUT_TURBO_DEFAULT_BUTTON) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_vertical_sync, MENU_ENUM_SUBLABEL_VIDEO_VSYNC) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_adaptive_vsync, MENU_ENUM_SUBLABEL_VIDEO_ADAPTIVE_VSYNC) diff --git a/retroarch.c b/retroarch.c index 7c27332d13..3242efca2a 100644 --- a/retroarch.c +++ b/retroarch.c @@ -24867,7 +24867,8 @@ static int16_t input_state_device( { p_rarch->input_driver_turbo_btns.turbo_pressed[port] |= (1 << 31); /* Toggle turbo for selected buttons. */ - if (!p_rarch->input_driver_turbo_btns.enable[port]) + if (p_rarch->input_driver_turbo_btns.enable[port] + != (1 << settings->uints.input_turbo_default_button)) { static const int button_map[]={ RETRO_DEVICE_ID_JOYPAD_B,