This commit is contained in:
twinaphex 2016-06-18 19:07:51 +02:00
parent 01f5d854e3
commit 3a031c3b48
2 changed files with 25 additions and 17 deletions

View File

@ -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:

View File

@ -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