From 366c73f429bf093fb0b7e876b3ea529709d1cdce Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 17 Aug 2017 19:07:38 +0200 Subject: [PATCH] Fix 'Append Disk Image' --- menu/cbs/menu_cbs_ok.c | 17 +++++++++++------ menu/widgets/menu_filebrowser.h | 1 + 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 95406f28c9..9919155f5e 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -370,6 +370,7 @@ int generic_action_ok_displaylist_push(const char *path, break; case ACTION_OK_DL_DISK_IMAGE_APPEND_LIST: filebrowser_clear_type(); + filebrowser_set_type(FILEBROWSER_APPEND_IMAGE); info.type = type; info.directory_ptr = idx; info_path = settings->paths.directory_menu_content; @@ -4880,13 +4881,15 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs, } else #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); } break; - case MENU_ENUM_LABEL_DISK_IMAGE_APPEND: - BIND_ACTION_OK(cbs, action_ok_disk_image_append); - break; default: BIND_ACTION_OK(cbs, action_ok_file_load); break; @@ -4906,13 +4909,15 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs, } else #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); } 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; diff --git a/menu/widgets/menu_filebrowser.h b/menu/widgets/menu_filebrowser.h index b5656549dc..93dac91e75 100644 --- a/menu/widgets/menu_filebrowser.h +++ b/menu/widgets/menu_filebrowser.h @@ -28,6 +28,7 @@ enum filebrowser_enums { FILEBROWSER_NONE = 0, FILEBROWSER_SELECT_DIR, + FILEBROWSER_APPEND_IMAGE, FILEBROWSER_SCAN_DIR, FILEBROWSER_SCAN_FILE, FILEBROWSER_SELECT_FILE,