From 27002ad1eaee1fcbf57f5ae5bb8a5b0692d85681 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 24 Apr 2014 10:48:52 +0200 Subject: db/Helpers: "list" on album artist falls back to the artist tag --- NEWS | 1 + src/db/Helpers.cxx | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index d48dfc44f..a64400e32 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ ver 0.19 (not yet released) - "listneighbors" lists file servers on the local network - "playlistadd" supports file:/// - "idle" with unrecognized event name fails + - "list" on album artist falls back to the artist tag * database - proxy: forward "idle" events - proxy: copy "Last-Modified" from remote directories diff --git a/src/db/Helpers.cxx b/src/db/Helpers.cxx index 719fa8741..43b0e8159 100644 --- a/src/db/Helpers.cxx +++ b/src/db/Helpers.cxx @@ -58,7 +58,10 @@ CollectTags(StringSet &set, TagType tag_type, const LightSong &song) assert(song.tag != nullptr); const Tag &tag = *song.tag; - if (!CheckUniqueTag(set, tag, tag_type)) + if (!CheckUniqueTag(set, tag, tag_type) && + (tag_type != TAG_ALBUM_ARTIST || + /* fall back to "Artist" if no "AlbumArtist" was found */ + !CheckUniqueTag(set, tag, TAG_ARTIST))) set.insert(""); return true; -- cgit v1.2.3