diff --git a/configuration.c b/configuration.c index 2b211beefa..3f2b1488f0 100644 --- a/configuration.c +++ b/configuration.c @@ -1345,7 +1345,6 @@ static struct config_bool_setting *populate_settings_bool( SETTING_BOOL("desktop_menu_enable", &settings->bools.desktop_menu_enable, true, DEFAULT_DESKTOP_MENU_ENABLE, false); SETTING_BOOL("video_gpu_record", &settings->bools.video_gpu_record, true, DEFAULT_GPU_RECORD, false); SETTING_BOOL("input_remap_binds_enable", &settings->bools.input_remap_binds_enable, true, true, false); - SETTING_BOOL("all_users_control_menu", &settings->bools.input_all_users_control_menu, true, DEFAULT_ALL_USERS_CONTROL_MENU, false); SETTING_BOOL("menu_swap_ok_cancel_buttons", &settings->bools.input_menu_swap_ok_cancel_buttons, true, DEFAULT_MENU_SWAP_OK_CANCEL_BUTTONS, false); #ifdef HAVE_NETWORKING SETTING_BOOL("netplay_public_announce", &settings->bools.netplay_public_announce, true, DEFAULT_NETPLAY_PUBLIC_ANNOUNCE, false); diff --git a/configuration.h b/configuration.h index d7a4c69a3c..ce761b789b 100644 --- a/configuration.h +++ b/configuration.h @@ -144,7 +144,6 @@ typedef struct settings bool input_overlay_auto_rotate; bool input_descriptor_label_show; bool input_descriptor_hide_unbound; - bool input_all_users_control_menu; bool input_menu_swap_ok_cancel_buttons; bool input_backtouch_enable; bool input_backtouch_toggle; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 4d25ccbc84..61b1e28f01 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -5084,10 +5084,6 @@ unsigned menu_displaylist_build_list( MENU_ENUM_LABEL_MENU_INPUT_SWAP_OK_CANCEL, PARSE_ONLY_BOOL, false) == 0) count++; - if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, - MENU_ENUM_LABEL_INPUT_ALL_USERS_CONTROL_MENU, - PARSE_ONLY_BOOL, false) == 0) - count++; break; case DISPLAYLIST_INPUT_SETTINGS_LIST: diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 224b33e8ac..8088179a33 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -11471,23 +11471,6 @@ static bool setting_append_list( SD_FLAG_NONE ); - CONFIG_BOOL( - list, list_info, - &settings->bools.input_all_users_control_menu, - MENU_ENUM_LABEL_INPUT_ALL_USERS_CONTROL_MENU, - MENU_ENUM_LABEL_VALUE_INPUT_ALL_USERS_CONTROL_MENU, - DEFAULT_ALL_USERS_CONTROL_MENU, - MENU_ENUM_LABEL_VALUE_OFF, - MENU_ENUM_LABEL_VALUE_ON, - &group_info, - &subgroup_info, - parent_group, - general_write_handler, - general_read_handler, - SD_FLAG_NONE - ); - SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); - CONFIG_BOOL( list, list_info, &settings->bools.input_remap_binds_enable, diff --git a/retroarch.c b/retroarch.c index 5dae716067..6290721102 100644 --- a/retroarch.c +++ b/retroarch.c @@ -23975,11 +23975,9 @@ static void input_menu_keys_pressed( { unsigned i, port; settings_t *settings = p_rarch->configuration_settings; - bool input_all_users_control_menu = settings->bools.input_all_users_control_menu; int input_hotkey_block_delay = settings->uints.input_hotkey_block_delay; uint8_t max_users = (uint8_t)p_rarch->input_driver_max_users; - uint8_t port_max = input_all_users_control_menu - ? max_users : 1; + uint8_t port_max = 1; for (i = 0; i < max_users; i++) {