From 3a031c3b4844a3a8fa04acc300b16ef492c9d6e6 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 18 Jun 2016 19:07:51 +0200 Subject: [PATCH] Cleanup --- menu/cbs/menu_cbs_ok.c | 38 +++++++++++++++++++++++++------------- menu/menu_hash.h | 4 ---- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 77c701709c..818cc755a2 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -3052,20 +3052,32 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs, } break; case MENU_FILE_CORE: - switch (menu_label_hash) + if (cbs && cbs->enum_idx != MENU_ENUM_LABEL_UNKNOWN) { - case MENU_LABEL_DEFERRED_CORE_LIST: - BIND_ACTION_OK(cbs, action_ok_load_core_deferred); - break; - 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; - case MENU_LABEL_CORE_UPDATER_LIST: - BIND_ACTION_OK(cbs, action_ok_deferred_list_stub); - break; + switch (cbs->enum_idx) + { + case MENU_ENUM_LABEL_CORE_UPDATER_LIST: + BIND_ACTION_OK(cbs, action_ok_deferred_list_stub); + break; + case MENU_ENUM_LABEL_UNKNOWN: + default: + break; + } + } + else + { + switch (menu_label_hash) + { + case MENU_LABEL_DEFERRED_CORE_LIST: + BIND_ACTION_OK(cbs, action_ok_load_core_deferred); + break; + 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; case MENU_FILE_DOWNLOAD_CORE_CONTENT: diff --git a/menu/menu_hash.h b/menu/menu_hash.h index fb260b1e19..9c68a81c4b 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -1376,9 +1376,6 @@ enum menu_hash_enums #define MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST 0xb4f82700U - -#define MENU_LABEL_DOWNLOAD_CORE_CONTENT 0xc63b1d3fU - /* Scan values */ #define MENU_LABEL_SCAN_THIS_DIRECTORY 0x6921b775U #define MENU_LABEL_SCAN_DIRECTORY 0x57de303eU @@ -1681,7 +1678,6 @@ enum menu_hash_enums #define MENU_LABEL_DETECT_CORE_LIST 0xaa07c341U #define MENU_LABEL_DETECT_CORE_LIST_OK 0xabba2a7aU -#define MENU_LABEL_CORE_UPDATER_LIST 0xe12f4ee3U #define MENU_LABEL_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE 0xa3d605f5U #define MENU_LABEL_CORE_UPDATER_BUILDBOT_URL 0xe9ad8448U #define MENU_LABEL_BUILDBOT_ASSETS_URL 0x1895c71eU