aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvdrfan <vdrfan-nospam@xbmc.org>2011-03-01 18:27:25 +0100
committervdrfan <vdrfan-nospam@xbmc.org>2011-03-01 18:29:22 +0100
commitf27a47f3ac861d752b43f10c7fa36724092ab7f2 (patch)
tree3fbbbf3801f05f61b7de85d534441794dc5b210c
parent8cb88a097fe0d655f480276b11972c7250a57319 (diff)
Revert "fixed: test for stacked paths before checking if item is in RAR/ZIP"
Even though it's correct to check for stacked paths this is causing weird problems with stacked archives and the media scanner. Reverting for the moment.
-rw-r--r--xbmc/utils/URIUtils.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/xbmc/utils/URIUtils.cpp b/xbmc/utils/URIUtils.cpp
index 04b09d0775..631b5d0e39 100644
--- a/xbmc/utils/URIUtils.cpp
+++ b/xbmc/utils/URIUtils.cpp
@@ -521,24 +521,14 @@ bool URIUtils::IsInArchive(const CStdString &strFile)
bool URIUtils::IsInZIP(const CStdString& strFile)
{
- CStdString strFile2(strFile);
-
- if (IsStack(strFile))
- strFile2 = CStackDirectory::GetFirstStackedFile(strFile);
-
- CURL url(strFile2);
+ CURL url(strFile);
return url.GetProtocol() == "zip" && url.GetFileName() != "";
}
bool URIUtils::IsInRAR(const CStdString& strFile)
{
- CStdString strFile2(strFile);
-
- if (IsStack(strFile))
- strFile2 = CStackDirectory::GetFirstStackedFile(strFile);
-
- CURL url(strFile2);
+ CURL url(strFile);
return url.GetProtocol() == "rar" && url.GetFileName() != "";
}