ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(XMB) Reset selection_ptr on horizontal switches, prevents a segfault

This commit is contained in:
Jean-André Santoni 2015-01-29 23:58:06 +01:00
parent d0a75a3441
commit bba772fd4c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
menu/menu_entries_cbs.c
View File

@ -1842,6 +1842,7 @@ static int action_toggle_mainmenu(unsigned type, const char *label,
{ {
if (!strcmp(driver.menu_ctx->ident, "xmb")) if (!strcmp(driver.menu_ctx->ident, "xmb"))
{ {
driver.menu->selection_ptr = 0;
switch (action) switch (action)
{ {
case MENU_ACTION_LEFT: case MENU_ACTION_LEFT:
@ -4322,7 +4323,9 @@ static void menu_entries_cbs_init_bind_toggle(menu_file_list_cbs_t *cbs,
case MENU_FILE_USE_DIRECTORY: case MENU_FILE_USE_DIRECTORY:
case MENU_FILE_PLAYLIST_ENTRY: case MENU_FILE_PLAYLIST_ENTRY:
case MENU_FILE_DOWNLOAD_CORE: case MENU_FILE_DOWNLOAD_CORE:
if (!strcmp(menu_label, "Horizontal Menu")) case MENU_SETTING_GROUP:
if (!strcmp(menu_label, "Horizontal Menu")
|| !strcmp(menu_label, "Main Menu"))
cbs->action_toggle = action_toggle_mainmenu; cbs->action_toggle = action_toggle_mainmenu;
else else
cbs->action_toggle = action_toggle_scroll; cbs->action_toggle = action_toggle_scroll;