jsonrpc: fix and improve fanart retrieval

2 files changed, 8 insertions, 4 deletions

diff --git a/xbmc/ThumbnailCache.cpp b/xbmc/ThumbnailCache.cpp
index f53f6ffae9..bafd769a11 100644
--- a/xbmc/ThumbnailCache.cpp
+++ b/xbmc/ThumbnailCache.cpp
@@ -209,7 +209,7 @@ CStdString CThumbnailCache::GetVideoThumb(const CFileItem &item)
 CStdString CThumbnailCache::GetFanart(const CFileItem &item)
 {
   // get the locally cached thumb
-  if (item.IsVideoDb())
+  if (item.IsVideoDb() || item.HasVideoInfoTag())
   {
     if (!item.HasVideoInfoTag())
       return "";
diff --git a/xbmc/interfaces/json-rpc/FileItemHandler.cpp b/xbmc/interfaces/json-rpc/FileItemHandler.cpp
index b39660f444..281e411a63 100644
--- a/xbmc/interfaces/json-rpc/FileItemHandler.cpp
+++ b/xbmc/interfaces/json-rpc/FileItemHandler.cpp
@@ -73,9 +73,13 @@ void CFileItemHandler::FillDetails(ISerializable* info, CFileItemPtr item, const
 
       if (field == "fanart" && !item->HasPictureInfoTag())
       {
-        CStdString cachedFanArt = item->GetCachedFanart();
-        if (!cachedFanArt.IsEmpty())
-          result["fanart"] = cachedFanArt.c_str();
+        CStdString fanart;
+        if (item->HasProperty("fanart_image"))
+          fanart = item->GetProperty("fanart_image").asString();
+        if (fanart.empty())
+          fanart = item->GetCachedFanart();
+        if (!fanart.empty())
+          result["fanart"] = fanart.c_str();
 
         continue;
       }