mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3487 from bparker06/help_cancel

Browse Source 
allow back/cancel button to dismiss help text
This commit is contained in:
Twinaphex 2016-09-02 07:06:33 +02:00 committed by GitHub
commit 96cc29be3f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
menu/drivers/menu_generic.c
View File

@ -323,8 +323,9 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action)
if (menu_driver_ctl(RARCH_MENU_CTL_IS_PENDING_QUIT_CONFIRM, NULL))
{
menu_driver_ctl(RARCH_MENU_CTL_UNSET_PENDING_QUIT_CONFIRM, NULL);
BIT64_SET(menu->state, MENU_STATE_POP_STACK);
}
BIT64_SET(menu->state, MENU_STATE_POP_STACK);
}
break;
@ -433,7 +434,7 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action)
}
BIT64_SET(menu->state, MENU_STATE_RENDER_MESSAGEBOX);
BIT64_SET(menu->state, MENU_STATE_POST_ITERATE);
if (action == MENU_ACTION_OK)
if (action == MENU_ACTION_OK || action == MENU_ACTION_CANCEL)
BIT64_SET(menu->state, MENU_STATE_POP_STACK);
break;
case ITERATE_TYPE_DEFAULT: