Merge pull request #4406 from jmarshallnz/thumb_fixes

Thumb fixes

diff --git a/xbmc/ThumbLoader.cpp b/xbmc/ThumbLoader.cpp
index 865b843..4aa7b2c 100644 (file)
--- a/xbmc/ThumbLoader.cpp
+++ b/xbmc/ThumbLoader.cpp
@@ -103,13 +103,12 @@ bool CProgramThumbLoader::FillThumb(CFileItem &item)
 
   if (thumb.empty())
   { // see whether we have a cached image for this item
-    CProgramThumbLoader loader;
-    thumb = loader.GetCachedImage(item, "thumb");
+    thumb = GetCachedImage(item, "thumb");
     if (thumb.empty())
     {
       thumb = GetLocalThumb(item);
       if (!thumb.empty())
-        loader.SetCachedImage(item, "thumb", thumb);
+        SetCachedImage(item, "thumb", thumb);
     }
   }
 

diff --git a/xbmc/music/MusicThumbLoader.cpp b/xbmc/music/MusicThumbLoader.cpp
index 7755b84..cb4039c 100644 (file)
--- a/xbmc/music/MusicThumbLoader.cpp
+++ b/xbmc/music/MusicThumbLoader.cpp
@@ -184,7 +184,8 @@ bool CMusicThumbLoader::FillThumb(CFileItem &item, bool folderThumbs /* = true *
     if (!thumb.empty())
       SetCachedImage(item, "thumb", thumb);
   }
-  item.SetArt("thumb", thumb);
+  if (!thumb.empty())
+    item.SetArt("thumb", thumb);
   return !thumb.empty();
 }
 

diff --git a/xbmc/video/VideoThumbLoader.cpp b/xbmc/video/VideoThumbLoader.cpp
index 7291eca..66eb7a9 100644 (file)
--- a/xbmc/video/VideoThumbLoader.cpp
+++ b/xbmc/video/VideoThumbLoader.cpp
@@ -467,7 +467,8 @@ bool CVideoThumbLoader::FillThumb(CFileItem &item)
     if (!thumb.empty())
       SetCachedImage(item, "thumb", thumb);
   }
-  item.SetArt("thumb", thumb);
+  if (!thumb.empty())
+    item.SetArt("thumb", thumb);
   return !thumb.empty();
 }