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

Merge pull request #1249 from lakkatv/xmb

Browse Source 
(XMB) Fix switch fall-through
This commit is contained in:
Twinaphex 2014-11-15 00:11:36 +01:00
commit fda9c048ae
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/backend/menu_common_backend.c
View File

@ -649,7 +649,9 @@ static int menu_common_iterate(unsigned action)
break; break;
case MENU_ACTION_LEFT: case MENU_ACTION_LEFT:
case MENU_ACTION_RIGHT: 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) 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)) || (action == MENU_ACTION_RIGHT && driver.menu->cat_selection_ptr == g_extern.core_info->count))

4
menu/menu_entries_cbs.c
View File

@ -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 if (list->elems[j].attr.i == RARCH_DIRECTORY) // is a directory
content_list_push(flist, info, list->elems[j].data); content_list_push(flist, info, list->elems[j].data);
else 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); string_list_free(list);
@ -1715,7 +1715,7 @@ static int deferred_push_content_list(void *data, void *userdata,
if (!info->supports_no_game) if (!info->supports_no_game)
content_list_push(list, info, g_settings.content_directory); content_list_push(list, info, g_settings.content_directory);
else 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; driver.menu->scroll_indices_size = 0;
menu_entries_build_scroll_indices(list); menu_entries_build_scroll_indices(list);