From 54c931755ec8bcc00d07793536a0cc7005eceb9d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 15 Jun 2015 04:35:14 +0200 Subject: [PATCH] Test --- menu/menu.c | 4 ++-- menu/menu_list.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/menu/menu.c b/menu/menu.c index 8a91fbd092..e882a39187 100644 --- a/menu/menu.c +++ b/menu/menu.c @@ -300,10 +300,10 @@ int menu_iterate(retro_input_t input, menu_handle_t *menu = menu_driver_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_input->joypad.state = menu_input_frame(input, trigger_input); + action = menu_input->joypad.state; ret = menu_entry_iterate(action); diff --git a/menu/menu_list.c b/menu/menu_list.c index 0ffa901ad2..32f317c27f 100644 --- a/menu/menu_list.c +++ b/menu/menu_list.c @@ -245,11 +245,11 @@ void *menu_list_get_last_stack_actiondata(const menu_list_t *list) } 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) { - if (needle_hash != 0) - return ((needle_hash == label_hash) ? 0 : 1); + if (needle) + return strcmp(needle, label); return type != final_type; } @@ -270,7 +270,7 @@ void menu_list_flush_stack(menu_list_t *list, menu_set_refresh(); 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_get_last(list->menu_stack, &path, &label, &type, &entry_idx);