From b52577aac107fe4661c0e0d1ec264af9a25954ad Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 15 Mar 2021 06:52:16 +0100 Subject: [PATCH] Cleanups --- retroarch.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/retroarch.c b/retroarch.c index adf97542b3..9d3add82cd 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2326,7 +2326,10 @@ static bool menu_driver_displaylist_push_internal( } static bool menu_driver_displaylist_push( - file_list_t *entry_list, file_list_t *entry_stack) + struct rarch_state *p_rarch, + struct menu_state *menu_st, + file_list_t *entry_list, + file_list_t *entry_stack) { menu_displaylist_info_t info; const char *path = NULL; @@ -2334,8 +2337,6 @@ static bool menu_driver_displaylist_push( unsigned type = 0; bool ret = false; enum msg_hash_enums enum_idx = MSG_UNKNOWN; - struct rarch_state *p_rarch = &rarch_st; - struct menu_state *menu_st = &p_rarch->menu_driver_state; file_list_t *list = MENU_LIST_GET(menu_st->entries.list, 0); menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*) list->list[list->size - 1].actiondata; @@ -2553,7 +2554,11 @@ int generic_menu_entry_action( if (MENU_ENTRIES_NEEDS_REFRESH(menu_st)) { bool refresh = false; - menu_driver_displaylist_push(selection_buf, menu_stack); + menu_driver_displaylist_push( + p_rarch, + menu_st, + selection_buf, + menu_stack); menu_entries_ctl(MENU_ENTRIES_CTL_UNSET_REFRESH, &refresh); } @@ -4347,7 +4352,11 @@ int menu_driver_deferred_push_content_list(file_list_t *list) menu_st->selection_ptr = 0; - if (!menu_driver_displaylist_push(list, selection_buf)) + if (!menu_driver_displaylist_push( + p_rarch, + menu_st, + list, + selection_buf)) return -1; return 0; }