Merge pull request #13491 from DaveTBlake/NavContainerFix

[Music]Fix Container.Art for collaboration albums
xbmc · Feb 11, 2018 · 8e666fe · 8e666fe
2 parents 6e960a8 + 59dc6c4
commit 8e666fe
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/xbmc/music/windows/GUIWindowMusicBase.cpp b/xbmc/music/windows/GUIWindowMusicBase.cpp
@@ -1235,14 +1235,23 @@ bool CGUIWindowMusicBase::GetDirectory(const std::string &strDirectory, CFileIte
     }
     if (artfound)
     {
+      std::string dirType = MediaTypeArtist;
+      if (params.GetAlbumId() > 0)
+        dirType = MediaTypeAlbum;
       std::map<std::string, std::string> artmap;
       for (auto artitem : art)
       {
         std::string artname;
-        artname = artitem.artType;
-        if (params.GetAlbumId() > 0 && artitem.mediaType != MediaTypeAlbum)
+        if (dirType == artitem.mediaType)
+          artname = artitem.artType;
+        else if (artitem.prefix.empty())
           artname = artitem.mediaType + "." + artitem.artType;
-        artmap.insert(std::make_pair(artname, artitem.url));
+        else
+        {
+          if (dirType == MediaTypeAlbum)
+            StringUtils::Replace(artitem.prefix, "albumartist", "artist");
+          artname = artitem.prefix + "." + artitem.artType;
+        }
       }
       items.SetArt(artmap);
     }