Merge pull request #7877 from pbureau/ArtistContainerArt

[CONTAINERART] Fix Container.Art property for artist directories
xbmc · Aug 28, 2015 · bfd7bd4 · bfd7bd4
2 parents f6b2447 + 7ebc9c5
commit bfd7bd4
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/xbmc/music/windows/GUIWindowMusicBase.cpp b/xbmc/music/windows/GUIWindowMusicBase.cpp
@@ -1129,7 +1129,7 @@ bool CGUIWindowMusicBase::GetDirectory(const std::string &strDirectory, CFileIte
   CQueryParams params;
   CDirectoryNode::GetDatabaseInfo(items.GetPath(), params);
 
-  if (params.GetAlbumId())
+  if (params.GetAlbumId() > 0)
   {
     map<string, string> artistArt;
     if (m_musicdatabase.GetArtistArtForItem(params.GetAlbumId(), MediaTypeAlbum, artistArt))
@@ -1139,6 +1139,12 @@ bool CGUIWindowMusicBase::GetDirectory(const std::string &strDirectory, CFileIte
     if (m_musicdatabase.GetArtForItem(params.GetAlbumId(), MediaTypeAlbum, albumArt))
       items.AppendArt(albumArt, MediaTypeAlbum);
   }
+  if (params.GetArtistId() > 0)
+  {
+    map<string, string> artistArt;
+    if (m_musicdatabase.GetArtForItem(params.GetArtistId(), "artist", artistArt))
+      items.AppendArt(artistArt, MediaTypeArtist);
+  }
 
   // add in the "New Playlist" item if we're in the playlists folder
   if ((items.GetPath() == "special://musicplaylists/") && !items.Contains("newplaylist://"))