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

Test

This commit is contained in:
twinaphex 2015-06-15 04:35:14 +02:00
parent 23263e2f97
commit 54c931755e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/menu.c
View File

@ -300,10 +300,10 @@ int menu_iterate(retro_input_t input,
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
menu_input_t *menu_input = menu_input_get_ptr(); menu_input_t *menu_input = menu_input_get_ptr();
menu_input->joypad.state = menu_input_frame(input, trigger_input);
menu_animation_update_time(menu->animation); menu_animation_update_time(menu->animation);
menu_input->joypad.state = menu_input_frame(input, trigger_input);
action = menu_input->joypad.state; action = menu_input->joypad.state;
ret = menu_entry_iterate(action); ret = menu_entry_iterate(action);

8
menu/menu_list.c
View File

@ -245,11 +245,11 @@ void *menu_list_get_last_stack_actiondata(const menu_list_t *list)
} }
static int menu_list_flush_stack_type( static int menu_list_flush_stack_type(
uint32_t needle_hash, uint32_t label_hash, const char *needle, const char *label,
unsigned type, unsigned final_type) unsigned type, unsigned final_type)
{ {
if (needle_hash != 0) if (needle)
return ((needle_hash == label_hash) ? 0 : 1); return strcmp(needle, label);
return type != final_type; return type != final_type;
} }
@ -270,7 +270,7 @@ void menu_list_flush_stack(menu_list_t *list,
menu_set_refresh(); menu_set_refresh();
menu_list_get_last(list->menu_stack, &path, &label, &type, &entry_idx); menu_list_get_last(list->menu_stack, &path, &label, &type, &entry_idx);
while (menu_list_flush_stack_type(needle_hash, label_hash, type, final_type) != 0) while (menu_list_flush_stack_type(needle, label, type, final_type) != 0)
{ {
menu_list_pop(list->menu_stack, &nav->selection_ptr); menu_list_pop(list->menu_stack, &nav->selection_ptr);
menu_list_get_last(list->menu_stack, &path, &label, &type, &entry_idx); menu_list_get_last(list->menu_stack, &path, &label, &type, &entry_idx);