Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

album art for individual songs in file mode weren't loading correctly…

… - fixes #13906
  • Loading branch information...
commit 3c2fc89d97b5dbcfa86bb057e43894e30adb9e98 1 parent 59a994c
Jonathan Marshall authored
Showing with 6 additions and 3 deletions.
  1. +6 −3 xbmc/music/MusicInfoLoader.cpp
View
9 xbmc/music/MusicInfoLoader.cpp
@@ -138,7 +138,8 @@ bool CMusicInfoLoader::LoadItem(CFileItem* pItem)
if (mapItem && mapItem->m_dateTime==pItem->m_dateTime && mapItem->HasMusicInfoTag() && mapItem->GetMusicInfoTag()->Loaded())
{ // Query map if we previously cached the file on HD
*pItem->GetMusicInfoTag() = *mapItem->GetMusicInfoTag();
- pItem->SetArt("thumb", mapItem->GetArt("thumb"));
+ if (mapItem->HasArt("thumb"))
+ pItem->SetArt("thumb", mapItem->GetArt("thumb"));
}
else
{
@@ -158,7 +159,8 @@ bool CMusicInfoLoader::LoadItem(CFileItem* pItem)
if ((song=m_songsMap.Find(pItem->GetPath()))!=NULL)
{ // Have we loaded this item from database before
pItem->GetMusicInfoTag()->SetSong(*song);
- pItem->SetArt("thumb", song->strThumb);
+ if (!song->strThumb.empty())
+ pItem->SetArt("thumb", song->strThumb);
}
else if (pItem->IsMusicDb())
{ // a music db item that doesn't have tag loaded - grab details from the database
@@ -168,7 +170,8 @@ bool CMusicInfoLoader::LoadItem(CFileItem* pItem)
if (m_musicDatabase.GetSongById(param.GetSongId(), song))
{
pItem->GetMusicInfoTag()->SetSong(song);
- pItem->SetArt("thumb", song.strThumb);
+ if (!song.strThumb.empty())
+ pItem->SetArt("thumb", song.strThumb);
}
}
else if (g_guiSettings.GetBool("musicfiles.usetags") || pItem->IsCDDA())
Please sign in to comment.
Something went wrong with that request. Please try again.