diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index fbb2eaaf73..a8aa520b02 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -823,6 +823,10 @@ static struct cbs_deferred_lbl_callback cbs_deferred2_lbl_list[] = { { MENU_ENUM_LABEL_LOAD_CONTENT_LIST, deferred_push_load_content_list + }, + { + MENU_ENUM_LABEL_SETTINGS, + deferred_push_settings } }; @@ -1136,9 +1140,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label( { switch (label_hash) { - case MENU_LABEL_SETTINGS: /* TODO/FIXME */ - BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_settings); - break; case MENU_LABEL_DEFERRED_CONFIGURATIONS_LIST: /* TODO/FIXME */ BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations_list); break; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index b3ab022fcd..203fe7c632 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -448,6 +448,14 @@ static struct cbs_title_lbl_callback cbs_title_lbl_list[] = { { MENU_ENUM_LABEL_LOAD_CONTENT_LIST, action_get_load_content_list + }, + { + MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY, + action_get_load_recent_list + }, + { + MENU_ENUM_LABEL_SETTINGS, + action_get_settings_list } }; @@ -911,9 +919,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_LABEL_INFORMATION_LIST: BIND_ACTION_GET_TITLE(cbs, action_get_title_information_list); break; - case MENU_LABEL_SETTINGS: - BIND_ACTION_GET_TITLE(cbs, action_get_settings_list); - break; case MENU_LABEL_DATABASE_MANAGER_LIST: BIND_ACTION_GET_TITLE(cbs, action_get_database_manager_list); break; @@ -950,9 +955,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_LABEL_CORE_OPTIONS: BIND_ACTION_GET_TITLE(cbs, action_get_core_options_list); break; - case MENU_LABEL_LOAD_CONTENT_HISTORY: - BIND_ACTION_GET_TITLE(cbs, action_get_load_recent_list); - break; case MENU_LABEL_CONTENT_SETTINGS: BIND_ACTION_GET_TITLE(cbs, action_get_quick_menu_list); break; diff --git a/msg_hash.h b/msg_hash.h index 90b010c185..8f65790247 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1956,11 +1956,9 @@ enum msg_hash_enums #define MENU_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING 0xd44d395cU /* Main menu */ -#define MENU_LABEL_LOAD_CONTENT_HISTORY 0xfe1d79e5U #define MENU_LABEL_ADD_CONTENT_LIST 0x046f4668U #define MENU_LABEL_ONLINE_UPDATER 0xcac0025eU #define MENU_LABEL_NETPLAY 0x0b511d22U -#define MENU_LABEL_SETTINGS 0x1304dc16U #define MENU_LABEL_HELP 0x7c97d2eeU #define MENU_VALUE_HORIZONTAL_MENU 0x35761704U