jsonrpc: fix bad if condition in CFooLibrary::FillFileItem

xbmc · Jul 15, 2013 · 80bb9b9 · 80bb9b9
1 parent 52e2c69
commit 80bb9b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/xbmc/interfaces/json-rpc/AudioLibrary.cpp b/xbmc/interfaces/json-rpc/AudioLibrary.cpp
@@ -587,9 +587,11 @@ bool CAudioLibrary::FillFileItem(const CStdString &strFilename, CFileItemPtr &it
   }
 
   if (item->GetLabel().empty())
+  {
     item->SetLabel(CUtil::GetTitleFromPath(strFilename, false));
-  if (item->GetLabel())
+    if (item->GetLabel().empty())
-    item->SetLabel(URIUtils::GetFileName(strFilename));
+      item->SetLabel(URIUtils::GetFileName(strFilename));
+  }
 
   return true;
 }

diff --git a/xbmc/interfaces/json-rpc/VideoLibrary.cpp b/xbmc/interfaces/json-rpc/VideoLibrary.cpp
@@ -700,9 +700,11 @@ bool CVideoLibrary::FillFileItem(const CStdString &strFilename, CFileItemPtr &it
 
   item->SetFromVideoInfoTag(details);
   if (item->GetLabel().empty())
+  {
     item->SetLabel(CUtil::GetTitleFromPath(strFilename, false));
-  if (item->GetLabel())
+    if (item->GetLabel().empty())
-    item->SetLabel(URIUtils::GetFileName(strFilename));
+      item->SetLabel(URIUtils::GetFileName(strFilename));
+  }
   return true;
 }