From 05a344d8310ef42285680e6d3252c6cd132aa0ee Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 7 Jun 2020 20:06:56 +0200 Subject: [PATCH] Cleanups --- retroarch.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/retroarch.c b/retroarch.c index 365a5169d5..aef17e7c27 100644 --- a/retroarch.c +++ b/retroarch.c @@ -3934,11 +3934,15 @@ void menu_entry_pathdir_extensions(uint32_t i, char *s, size_t len) void menu_entry_reset(uint32_t i) { menu_entry_t entry; + struct rarch_state *p_rarch = &rarch_st; menu_entry_init(&entry); menu_entry_get(&entry, 0, i, NULL, true); - menu_entry_action(&entry, (size_t)i, MENU_ACTION_START); + if ( p_rarch->menu_driver_ctx + && p_rarch->menu_driver_ctx->entry_action) + p_rarch->menu_driver_ctx->entry_action( + p_rarch->menu_userdata, &entry, (size_t)i, MENU_ACTION_START); } void menu_entry_get_value(menu_entry_t *entry, const char **value) @@ -4142,7 +4146,11 @@ int menu_entry_select(uint32_t i) menu_entry_init(&entry); menu_entry_get(&entry, 0, i, NULL, false); - return menu_entry_action(&entry, (size_t)i, MENU_ACTION_SELECT); + if ( p_rarch->menu_driver_ctx + && p_rarch->menu_driver_ctx->entry_action) + return p_rarch->menu_driver_ctx->entry_action( + p_rarch->menu_userdata, &entry, (size_t)i, MENU_ACTION_SELECT); + return -1; } int menu_entry_action(