From 2ad2983b25d1e1f6a50650a1f0a923db309348b7 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 3 Dec 2019 01:53:00 +0100 Subject: [PATCH] Move HELP_SCREEN_LIST to build_list --- menu/menu_displaylist.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index ea388f53fb..673feb3c56 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3816,6 +3816,21 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct switch (type) { + case DISPLAYLIST_HELP_SCREEN_LIST: + if (menu_entries_append_enum(list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_HELP_CONTROLS), + msg_hash_to_str(MENU_ENUM_LABEL_HELP_CONTROLS), + MENU_ENUM_LABEL_HELP_CONTROLS, + 0, 0, 0)) + count++; + if (menu_entries_append_enum(list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_HELP_SEND_DEBUG_INFO), + msg_hash_to_str(MENU_ENUM_LABEL_HELP_SEND_DEBUG_INFO), + MENU_ENUM_LABEL_HELP_SEND_DEBUG_INFO, + 0, 0, 0)) + count++; + break; + break; case DISPLAYLIST_AUDIO_SETTINGS_LIST: if (menu_displaylist_parse_settings_enum(list, MENU_ENUM_LABEL_MIDI_SETTINGS, @@ -8001,6 +8016,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, case DISPLAYLIST_OPTIONS_REMAPPINGS: case DISPLAYLIST_VIDEO_SETTINGS_LIST: case DISPLAYLIST_AUDIO_SETTINGS_LIST: + case DISPLAYLIST_HELP_SCREEN_LIST: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); count = menu_displaylist_build_list(info->list, type); @@ -8751,24 +8767,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, count++; menu_dialog_unset_pending_push(); break; - case DISPLAYLIST_HELP_SCREEN_LIST: - menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); - if (menu_entries_append_enum(info->list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_HELP_CONTROLS), - msg_hash_to_str(MENU_ENUM_LABEL_HELP_CONTROLS), - MENU_ENUM_LABEL_HELP_CONTROLS, - 0, 0, 0)) - count++; - if (menu_entries_append_enum(info->list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_HELP_SEND_DEBUG_INFO), - msg_hash_to_str(MENU_ENUM_LABEL_HELP_SEND_DEBUG_INFO), - MENU_ENUM_LABEL_HELP_SEND_DEBUG_INFO, - 0, 0, 0)) - count++; - - info->need_refresh = true; - info->need_push = true; - break; case DISPLAYLIST_BROWSE_URL_START: menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); #ifdef HAVE_NETWORKING