From 123e47b33d8e6945665b8cb0731eca13be7aa699 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 6 Jun 2015 16:30:21 +0200 Subject: [PATCH] Simplify action_select_default --- menu/menu_entries_cbs_select.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/menu/menu_entries_cbs_select.c b/menu/menu_entries_cbs_select.c index 3870369cc5..e1fb518849 100644 --- a/menu/menu_entries_cbs_select.c +++ b/menu/menu_entries_cbs_select.c @@ -24,27 +24,11 @@ static int action_select_default(const char *path, const char *label, unsigned t size_t idx) { int ret = 0; - menu_entry_t entry; - enum menu_action action = MENU_ACTION_NOOP; - menu_file_list_cbs_t *cbs = NULL; - menu_list_t *menu_list = menu_list_get_ptr(); - rarch_setting_t *setting = menu_setting_find( - menu_list->selection_buf->list[idx].label); + menu_entry_t entry = {{0}}; menu_entry_get(&entry, idx, NULL, false); - cbs = menu_list_get_actiondata_at_offset(menu_list->selection_buf, idx); - - if ((cbs && cbs->action_ok) || menu_setting_is_of_general_type(setting)) - action = MENU_ACTION_OK; - else { if (cbs && cbs->action_start) - action = MENU_ACTION_START; - if (cbs && cbs->action_right) - action = MENU_ACTION_RIGHT; - } - - if (action != MENU_ACTION_NOOP) - ret = menu_entry_action(&entry, idx, action); + ret = menu_entry_action(&entry, idx, MENU_ACTION_SELECT); rarch_main_data_iterate();