aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvdrfan <vdrfan-nospam@xbmc.org>2011-02-27 11:41:05 +0100
committervdrfan <vdrfan-nospam@xbmc.org>2011-02-27 11:41:05 +0100
commit77b1612c3b4e5cda959861d90d999db71fc575df (patch)
treee52fb97368cd89d451c874ac8787f3297d11ba38
parentb6cbebc383bea0c46261955277f7b3c8db0a4c98 (diff)
fixed: test for stacked paths before checking if item is in RAR/ZIP
-rw-r--r--xbmc/utils/URIUtils.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/xbmc/utils/URIUtils.cpp b/xbmc/utils/URIUtils.cpp
index 631b5d0e39..04b09d0775 100644
--- a/xbmc/utils/URIUtils.cpp
+++ b/xbmc/utils/URIUtils.cpp
@@ -521,14 +521,24 @@ bool URIUtils::IsInArchive(const CStdString &strFile)
bool URIUtils::IsInZIP(const CStdString& strFile)
{
- CURL url(strFile);
+ CStdString strFile2(strFile);
+
+ if (IsStack(strFile))
+ strFile2 = CStackDirectory::GetFirstStackedFile(strFile);
+
+ CURL url(strFile2);
return url.GetProtocol() == "zip" && url.GetFileName() != "";
}
bool URIUtils::IsInRAR(const CStdString& strFile)
{
- CURL url(strFile);
+ CStdString strFile2(strFile);
+
+ if (IsStack(strFile))
+ strFile2 = CStackDirectory::GetFirstStackedFile(strFile);
+
+ CURL url(strFile2);
return url.GetProtocol() == "rar" && url.GetFileName() != "";
}