diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 2eeb783ff9..ef0780f51b 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -141,7 +141,6 @@ typedef struct menu_ctx_driver const char *ident; menu_video_driver_type_t type; int (*environ_cb)(menu_environ_cb_t type, void *data); - bool (*perform_action)(void* data, unsigned action); } menu_ctx_driver_t; extern menu_ctx_driver_t menu_ctx_rmenu; diff --git a/menu/menu_input.c b/menu/menu_input.c index e5e11cb902..e360b3b3a4 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -945,7 +945,7 @@ void menu_input_post_iterate(int *ret, unsigned action) unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input) { - unsigned ret = 0; + unsigned ret = MENU_ACTION_NOOP; static bool initial_held = true; static bool first_held = false; static const retro_input_t input_repeat = @@ -1033,8 +1033,6 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input) ret = MENU_ACTION_INFO; else if (trigger_input & (UINT64_C(1) << RARCH_MENU_TOGGLE)) ret = MENU_ACTION_TOGGLE; - else - ret = MENU_ACTION_NOOP; if (settings->menu.mouse.enable) menu_input_mouse(&ret); @@ -1042,10 +1040,5 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input) if (settings->menu.pointer.enable) menu_input_pointer(&ret); - if (trigger_input && - menu_ctx_driver_get_ptr()->perform_action && - menu_ctx_driver_get_ptr()->perform_action(menu->userdata, ret)) - return MENU_ACTION_NOOP; - return ret; }