From 11ff498f3db2c49f963af225f33c290afb30904b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 6 Feb 2018 13:14:46 +0100 Subject: [PATCH] Get rid of hash --- menu/cbs/menu_cbs_ok.c | 8 +++++--- menu/cbs/menu_cbs_title.c | 7 ++++--- msg_hash.h | 1 - 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index d69cd8fb71..c410f4b0bf 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -4460,6 +4460,11 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs, break; } } + else if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_LIST))) + { + BIND_ACTION_OK(cbs, action_ok_load_core); + break; + } else { switch (menu_label_hash) @@ -4470,9 +4475,6 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs, case MENU_LABEL_DEFERRED_CORE_LIST_SET: BIND_ACTION_OK(cbs, action_ok_core_deferred_set); break; - case MENU_LABEL_CORE_LIST: - BIND_ACTION_OK(cbs, action_ok_load_core); - break; } } break; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index b8bd77d8dd..dc9bee36db 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -544,6 +544,10 @@ static struct cbs_title_lbl_callback cbs_title_lbl_list[] = { { MENU_ENUM_LABEL_CONFIGURATIONS, action_get_title_configurations + }, + { + MENU_ENUM_LABEL_CORE_LIST, + action_get_core_list } }; @@ -1010,9 +1014,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_LABEL_CORE_INFORMATION: BIND_ACTION_GET_TITLE(cbs, action_get_core_information_list); break; - case MENU_LABEL_CORE_LIST: - BIND_ACTION_GET_TITLE(cbs, action_get_core_list); - break; case MENU_ENUM_LABEL_LOAD_CONTENT_SPECIAL: BIND_ACTION_GET_TITLE(cbs, action_get_load_content_special); break; diff --git a/msg_hash.h b/msg_hash.h index f2b1b214c1..c7d9478c6c 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1829,7 +1829,6 @@ enum msg_hash_enums #define MENU_LABEL_RDB_ENTRY_RELEASE_YEAR 0x14c9c6bfU #define MENU_LABEL_RDB_ENTRY_MAX_USERS 0xfae91cc4U -#define MENU_LABEL_CORE_LIST 0xa22bb14dU #define MENU_LABEL_MANAGEMENT 0x2516c88aU #define MENU_LABEL_FRONTEND_COUNTERS 0xe5696877U #define MENU_LABEL_CORE_COUNTERS 0x64cc83e0U