jsonrpc: set label for items added by file without any additional metadata

2 files changed, 6 insertions, 0 deletions

diff --git a/xbmc/interfaces/json-rpc/FileItemHandler.cpp b/xbmc/interfaces/json-rpc/FileItemHandler.cpp
index e3f3212084..0a88a88c9b 100644
--- a/xbmc/interfaces/json-rpc/FileItemHandler.cpp
+++ b/xbmc/interfaces/json-rpc/FileItemHandler.cpp
@@ -232,6 +232,8 @@ bool CFileItemHandler::FillFileItemList(const Value &parameterObject, CFileItemL
     if (!added)
     {
       CFileItemPtr item = CFileItemPtr(new CFileItem(file, false));
+      if (item->GetLabel().IsEmpty())
+        item->SetLabel(CUtil::GetTitleFromPath(file, false));
       list.Add(item);
     }
   }
diff --git a/xbmc/interfaces/json-rpc/FileOperations.cpp b/xbmc/interfaces/json-rpc/FileOperations.cpp
index fc7b4ab1cf..86c040a49e 100644
--- a/xbmc/interfaces/json-rpc/FileOperations.cpp
+++ b/xbmc/interfaces/json-rpc/FileOperations.cpp
@@ -176,7 +176,11 @@ bool CFileOperations::FillFileItem(const CStdString &strFilename, CFileItem &ite
       status |= CAudioLibrary::FillFileItem(strFilename, item);
 
     if (!status)
+    {
       item = CFileItem(strFilename, false);
+      if (item.GetLabel().IsEmpty())
+        item.SetLabel(CUtil::GetTitleFromPath(strFilename, false));
+    }
 
     status = true;
   }