[Xbmc4xbox-commits] SF.net SVN: xbmc4xbox:[30960] trunk/xbmc/FileItem.cpp

[<ar...@us...>]

Revision: 30960
          http://xbmc4xbox.svn.sourceforge.net/xbmc4xbox/?rev=30960&view=rev
Author:   arnova
Date:     2011-08-25 15:03:06 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
fixed: We can't check for fanart, trailers & video thumbs on dvd:// paths
fixed: No need to check twice whether it's a plugin

Modified Paths:
--------------
    trunk/xbmc/FileItem.cpp

Modified: trunk/xbmc/FileItem.cpp
===================================================================
--- trunk/xbmc/FileItem.cpp	2011-08-22 18:23:19 UTC (rev 30959)
+++ trunk/xbmc/FileItem.cpp	2011-08-25 15:03:06 UTC (rev 30960)
@@ -2387,7 +2387,6 @@
    || CUtil::IsUPnP(m_strPath)
    || IsPlugin()
    || (CUtil::IsFTP(m_strPath) && !g_advancedSettings.m_bFTPThumbs)
-   || IsPlugin()
    || IsParentFolder()
    || IsMusicDb())
     return "";
@@ -2717,6 +2716,7 @@
    || CUtil::IsUPnP(strFile)
    || IsLiveTV()
    || IsPlugin()
+   || m_strPath.Left(4).Equals("dvd:")
    || (CUtil::IsFTP(strFile) && !g_advancedSettings.m_bFTPThumbs)
    || m_strPath.IsEmpty())
     return "";
@@ -3147,7 +3147,7 @@
 
 CStdString CFileItem::FindTrailer() const
 {
-  CStdString strFile2, strTrailer;
+  CStdString strFile2;
   CStdString strFile = m_strPath;
   if (IsStack())
   {
@@ -3173,8 +3173,9 @@
   if (IsInternetStream()
    || CUtil::IsUPnP(strFile)
    || IsLiveTV()
-   || IsPlugin())
-    return strTrailer;
+   || IsPlugin()
+   || m_strPath.Left(4).Equals("dvd:"))
+    return "";
 
   CStdString strDir;
   CUtil::GetDirectory(strFile, strDir);
@@ -3199,6 +3200,7 @@
     strRegExp++;
   }
 
+  CStdString strTrailer;
   for (int i = 0; i < items.Size(); i++)
   {
     CStdString strCandidate = items[i]->m_strPath;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.