mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-07 12:39:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6263 from fr500/master

Browse Source 
Fix #6255
This commit is contained in:
Andrés 2018-02-09 10:02:54 -05:00 committed by GitHub
commit a5be56dd77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
menu/cbs/menu_cbs_ok.c
View File

@ -437,7 +437,6 @@ int generic_action_ok_displaylist_push(const char *path,
break; break;
case ACTION_OK_DL_DISK_IMAGE_APPEND_LIST: case ACTION_OK_DL_DISK_IMAGE_APPEND_LIST:
filebrowser_clear_type(); filebrowser_clear_type();
filebrowser_set_type(FILEBROWSER_APPEND_IMAGE);
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
info_path = settings->paths.directory_menu_content; info_path = settings->paths.directory_menu_content;
@ -4520,15 +4519,13 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
} }
else else
#endif #endif
if (filebrowser_get_type() == FILEBROWSER_APPEND_IMAGE)
{
BIND_ACTION_OK(cbs, action_ok_disk_image_append);
}
else
{ {
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_ENUM_LABEL_DISK_IMAGE_APPEND:
BIND_ACTION_OK(cbs, action_ok_disk_image_append);
break;
default: default:
BIND_ACTION_OK(cbs, action_ok_file_load); BIND_ACTION_OK(cbs, action_ok_file_load);
break; break;
@ -4548,15 +4545,13 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
} }
else else
#endif #endif
if (filebrowser_get_type() == FILEBROWSER_APPEND_IMAGE)
{
BIND_ACTION_OK(cbs, action_ok_disk_image_append);
}
else
{ {
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:
BIND_ACTION_OK(cbs, action_ok_disk_image_append);
break;
default: default:
BIND_ACTION_OK(cbs, action_ok_file_load); BIND_ACTION_OK(cbs, action_ok_file_load);
break; break;

1
menu/widgets/menu_filebrowser.h
View File

@ -28,7 +28,6 @@ enum filebrowser_enums
{ {
FILEBROWSER_NONE = 0, FILEBROWSER_NONE = 0,
FILEBROWSER_SELECT_DIR, FILEBROWSER_SELECT_DIR,
FILEBROWSER_APPEND_IMAGE,
FILEBROWSER_SCAN_DIR, FILEBROWSER_SCAN_DIR,
FILEBROWSER_SCAN_FILE, FILEBROWSER_SCAN_FILE,
FILEBROWSER_SELECT_FILE, FILEBROWSER_SELECT_FILE,