mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

FILE_TYPE_PLAIN - add enum_idx fallback

Browse Source
This commit is contained in:
twinaphex 2016-07-03 10:56:41 +02:00
parent 54e137d9f7
commit fa2d1c25a2
1 changed files with 56 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
menu/cbs/menu_cbs_ok.c
View File

@ -3539,33 +3539,67 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
case FILE_TYPE_IN_CARCHIVE: case FILE_TYPE_IN_CARCHIVE:
#endif #endif
case FILE_TYPE_PLAIN: case FILE_TYPE_PLAIN:
switch (menu_label_hash) if (cbs->enum_idx != MSG_UNKNOWN)
{ {
switch (cbs->enum_idx)
{
#ifdef HAVE_LIBRETRODB #ifdef HAVE_LIBRETRODB
case MENU_LABEL_SCAN_FILE: case MENU_ENUM_LABEL_SCAN_FILE:
BIND_ACTION_OK(cbs, action_ok_scan_file); BIND_ACTION_OK(cbs, action_ok_scan_file);
break; break;
#endif #endif
case MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST: case MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST:
case MENU_LABEL_DETECT_CORE_LIST: case MENU_ENUM_LABEL_DETECT_CORE_LIST:
case MENU_LABEL_DEFERRED_ARCHIVE_OPEN_DETECT_CORE: case MENU_ENUM_LABEL_DEFERRED_ARCHIVE_OPEN_DETECT_CORE:
#ifdef HAVE_COMPRESSION #ifdef HAVE_COMPRESSION
if (type == FILE_TYPE_IN_CARCHIVE) if (type == FILE_TYPE_IN_CARCHIVE)
{ {
BIND_ACTION_OK(cbs, action_ok_file_load_with_detect_core_carchive); BIND_ACTION_OK(cbs, action_ok_file_load_with_detect_core_carchive);
} }
else else
#endif #endif
{ {
BIND_ACTION_OK(cbs, action_ok_file_load_with_detect_core); BIND_ACTION_OK(cbs, action_ok_file_load_with_detect_core);
} }
break; break;
case MENU_LABEL_DISK_IMAGE_APPEND: case MENU_ENUM_LABEL_DISK_IMAGE_APPEND:
BIND_ACTION_OK(cbs, action_ok_disk_image_append); BIND_ACTION_OK(cbs, action_ok_disk_image_append);
break; break;
default: default:
BIND_ACTION_OK(cbs, action_ok_file_load); BIND_ACTION_OK(cbs, action_ok_file_load);
break; break;
}
}
else
{
switch (menu_label_hash)
{
#ifdef HAVE_LIBRETRODB
case MENU_LABEL_SCAN_FILE:
BIND_ACTION_OK(cbs, action_ok_scan_file);
break;
#endif
case MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST:
case MENU_LABEL_DETECT_CORE_LIST:
case MENU_LABEL_DEFERRED_ARCHIVE_OPEN_DETECT_CORE:
#ifdef HAVE_COMPRESSION
if (type == FILE_TYPE_IN_CARCHIVE)
{
BIND_ACTION_OK(cbs, action_ok_file_load_with_detect_core_carchive);
}
else
#endif
{
BIND_ACTION_OK(cbs, action_ok_file_load_with_detect_core);
}
break;
case MENU_LABEL_DISK_IMAGE_APPEND:
BIND_ACTION_OK(cbs, action_ok_disk_image_append);
break;
default:
BIND_ACTION_OK(cbs, action_ok_file_load);
break;
}
} }
break; break;
case FILE_TYPE_MOVIE: case FILE_TYPE_MOVIE: