From c7da6e1ca8cd186df5c8eff709bb7d20d28b0dc3 Mon Sep 17 00:00:00 2001 From: Mikael Brunnhede Date: Mon, 9 Oct 2017 11:21:10 +0200 Subject: [PATCH] Fix issue with "Information" option being hidden when launching content. --- menu/menu_displaylist.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 91724dcd98..f0357d7316 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3018,8 +3018,10 @@ static int menu_displaylist_parse_horizontal_content_actions( 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)) + bool content_loaded = !rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL) + && string_is_equal(menu->deferred_path, fullpath); + + if (content_loaded) menu_displaylist_parse_load_content_settings(info); else { @@ -3058,7 +3060,8 @@ static int menu_displaylist_parse_horizontal_content_actions( MENU_SETTING_ACTION_DELETE_ENTRY, 0, 0); } - if (settings->bools.quick_menu_show_information && !string_is_empty(db_name)) + if (!string_is_empty(db_name) && (!content_loaded || + (content_loaded && settings->bools.quick_menu_show_information))) { char *db_path = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));