Skip to content
Permalink
Browse files

squash: Also skip ScanArchiveForAssociatedItems when filelists.browse…

…archives is disabled
  • Loading branch information...
popcornmix committed Apr 11, 2016
1 parent de1f79d commit c08120652d2c57e9ea1bb4fcc3aec7bd4757e96e
Showing with 2 additions and 2 deletions.
  1. +2 −2 xbmc/Util.cpp
@@ -1773,7 +1773,7 @@ void CUtil::ScanPathsForAssociatedItems(const std::string& videoName,
URIUtils::RemoveExtension(strCandidate);
if (StringUtils::StartsWithNoCase(strCandidate, videoName))
{
if (URIUtils::IsRAR(pItem->GetPath()) || URIUtils::IsZIP(pItem->GetPath()))
if (CSettings::GetInstance().GetBool("filelists.browsearchives") && (URIUtils::IsRAR(pItem->GetPath()) || URIUtils::IsZIP(pItem->GetPath())))
CUtil::ScanArchiveForAssociatedItems(pItem->GetPath(), "", item_exts, associatedFiles);
else
{
@@ -1783,7 +1783,7 @@ void CUtil::ScanPathsForAssociatedItems(const std::string& videoName,
}
else
{
if (URIUtils::IsRAR(pItem->GetPath()) || URIUtils::IsZIP(pItem->GetPath()))
if (CSettings::GetInstance().GetBool("filelists.browsearchives") && (URIUtils::IsRAR(pItem->GetPath()) || URIUtils::IsZIP(pItem->GetPath())))
CUtil::ScanArchiveForAssociatedItems(pItem->GetPath(), videoName, item_exts, associatedFiles);
}
}

0 comments on commit c081206

Please sign in to comment.
You can’t perform that action at this time.