From b355217e6d66261e83deec5f72887f3d4e465e2f Mon Sep 17 00:00:00 2001 From: SecularSteve <33793273+SecularSteve@users.noreply.github.com> Date: Thu, 20 May 2021 14:45:21 +0200 Subject: [PATCH] small fixes --- menu/menu_setting.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index f14c09752d..6e864362b5 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -7419,12 +7419,7 @@ static void general_write_handler(rarch_setting_t *setting) } break; case MENU_ENUM_LABEL_INPUT_MAX_USERS: - { - bool refresh = false; - command_event(CMD_EVENT_CONTROLLER_INIT, NULL); - menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh); - menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, NULL); - } + command_event(CMD_EVENT_CONTROLLER_INIT, NULL); break; case MENU_ENUM_LABEL_INPUT_PLAYER1_JOYPAD_INDEX: case MENU_ENUM_LABEL_INPUT_PLAYER2_JOYPAD_INDEX: @@ -12155,7 +12150,9 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; + (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; + (*list)[list_info->index - 1].action_left = &setting_uint_action_left_with_refresh; + (*list)[list_info->index - 1].action_right = &setting_uint_action_right_with_refresh; (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_max_users; (*list)[list_info->index - 1].offset_by = 1; @@ -17654,6 +17651,27 @@ static bool setting_append_list( (*list)[list_info->index - 1].action_left = setting_bool_action_left_with_refresh; (*list)[list_info->index - 1].action_right = setting_bool_action_right_with_refresh; + /* Playlist entry index display is currently + * supported only by Ozone */ + if (string_is_equal(settings->arrays.menu_driver, "ozone")) + { + CONFIG_BOOL( + list, list_info, + &settings->bools.playlist_show_entry_idx, + MENU_ENUM_LABEL_PLAYLIST_SHOW_ENTRY_IDX, + MENU_ENUM_LABEL_VALUE_PLAYLIST_SHOW_ENTRY_IDX, + DEFAULT_PLAYLIST_SHOW_ENTRY_IDX, + 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 + ); + } + CONFIG_UINT( list, list_info, &settings->uints.playlist_sublabel_runtime_type,