From ad7cb35d31d65a31e1289e84671eb6b5d0d21a47 Mon Sep 17 00:00:00 2001 From: orbea Date: Fri, 1 Mar 2019 11:07:06 -0800 Subject: [PATCH] Fix double root directory. Fixes https://github.com/libretro/RetroArch/issues/8385 Regression after https://github.com/libretro/RetroArch/commit/5fcedc86195c9b1b8a79c7b5f9e59f9c5c46012b --- menu/cbs/menu_cbs_ok.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index f8edfa38f3..9a58bc44ba 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -6009,7 +6009,12 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs, BIND_ACTION_OK(cbs, action_ok_parent_directory_push); break; case FILE_TYPE_DIRECTORY: - BIND_ACTION_OK(cbs, action_ok_directory_push); + if (cbs->enum_idx != MSG_UNKNOWN + || menu_label_hash == MENU_LABEL_DISK_IMAGE_APPEND + || menu_label_hash == MENU_LABEL_SUBSYSTEM_ADD) + BIND_ACTION_OK(cbs, action_ok_directory_push); + else + BIND_ACTION_OK(cbs, action_ok_push_random_dir); break; case FILE_TYPE_CARCHIVE: if (filebrowser_get_type() == FILEBROWSER_SCAN_FILE)