Merge pull request #8314 from jdgleaver/rgui-playlist-title

(RGUI) Improve playlist titles
This commit is contained in:
Twinaphex 2019-02-18 16:31:00 +01:00 committed by GitHub
commit 16a5448f43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions

View File

@ -2364,16 +2364,30 @@ static void rgui_populate_entries(void *data,
const char *path,
const char *label, unsigned k)
{
bool title_set = false;
rgui_t *rgui = (rgui_t*)data;
if (!rgui)
return;
menu_entries_get_title(rgui->menu_title, sizeof(rgui->menu_title));
/* Check whether we are currently viewing a playlist */
rgui->is_playlist = string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_PLAYLIST_LIST));
/* Set menu title */
if (rgui->is_playlist)
{
if (!string_is_empty(rgui->thumbnail_system))
{
/* Note: rgui->thumbnail_system is *always* the basename (without
* extension) of the currently loaded playlist */
memcpy(rgui->menu_title, rgui->thumbnail_system, sizeof(rgui->menu_title));
title_set = true;
}
}
if (!title_set)
menu_entries_get_title(rgui->menu_title, sizeof(rgui->menu_title));
rgui_navigation_set(data, true);
}