From c66222bd0c1174035ed1c40e754b2ea36ed07090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Sat, 15 Nov 2014 00:10:41 +0100 Subject: [PATCH] (XMB) Fix switch fall-through --- menu/backend/menu_common_backend.c | 4 +++- menu/menu_entries_cbs.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/menu/backend/menu_common_backend.c b/menu/backend/menu_common_backend.c index 202304624c..05cfaf4f81 100644 --- a/menu/backend/menu_common_backend.c +++ b/menu/backend/menu_common_backend.c @@ -649,7 +649,9 @@ static int menu_common_iterate(unsigned action) break; case MENU_ACTION_LEFT: case MENU_ACTION_RIGHT: - if (file_list_get_size(driver.menu->menu_list->menu_stack) == 1 && !strcmp(driver.menu_ctx->ident, "xmb")) + if ((action == MENU_ACTION_LEFT || action == MENU_ACTION_RIGHT) + && file_list_get_size(driver.menu->menu_list->menu_stack) == 1 + && !strcmp(driver.menu_ctx->ident, "xmb")) { if ((action == MENU_ACTION_LEFT && driver.menu->cat_selection_ptr == 0) || (action == MENU_ACTION_RIGHT && driver.menu->cat_selection_ptr == g_extern.core_info->count)) diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index 24340dec6a..c0f7ec265a 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -1673,7 +1673,7 @@ static void content_list_push(void *data, core_info_t *info, const char* path) if (list->elems[j].attr.i == RARCH_DIRECTORY) // is a directory content_list_push(flist, info, list->elems[j].data); else - menu_list_push(flist, path_basename(list->elems[j].data), "", MENU_FILE_PLAYLIST_ENTRY, 0); + menu_list_push(flist, path_basename(list->elems[j].data), "", MENU_FILE_PLAIN, 0); } string_list_free(list); @@ -1715,7 +1715,7 @@ static int deferred_push_content_list(void *data, void *userdata, if (!info->supports_no_game) content_list_push(list, info, g_settings.content_directory); else - menu_list_push(list, info->display_name, "", MENU_FILE_PLAYLIST_ENTRY, 0); + menu_list_push(list, info->display_name, "", MENU_FILE_PLAIN, 0); driver.menu->scroll_indices_size = 0; menu_entries_build_scroll_indices(list);