From 1b754cf62d984cf7450f672986c68f81540857f4 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 27 May 2017 16:18:14 +0200 Subject: [PATCH] (menu_displaylist_parse_horizontal_content_actions - Move playlist code up --- menu/menu_displaylist.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 5667cca812..5bdcd0f248 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2915,6 +2915,7 @@ static int menu_displaylist_parse_horizontal_content_actions( unsigned idx = rpl_entry_selection_ptr; menu_handle_t *menu = NULL; const char *label = NULL; + const char *entry_path = NULL; const char *core_path = NULL; const char *core_name = NULL; const char *db_name = NULL; @@ -2925,6 +2926,11 @@ static int menu_displaylist_parse_horizontal_content_actions( if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) return -1; + menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_GET, &playlist); + + playlist_get_index(playlist, idx, + &entry_path, &label, &core_path, &core_name, NULL, &db_name); + if (!rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL) && string_is_equal(menu->deferred_path, fullpath)) menu_displaylist_parse_load_content_settings(info); @@ -2943,11 +2949,6 @@ static int menu_displaylist_parse_horizontal_content_actions( MENU_SETTING_ACTION_DELETE_ENTRY, 0, 0); } - menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_GET, &playlist); - - playlist_get_index(playlist, idx, - NULL, &label, &core_path, &core_name, NULL, &db_name); - if (!string_is_empty(db_name)) { char db_path[PATH_MAX_LENGTH];