Skip to content

Commit

Permalink
Merge pull request xbmc#18201 from AlwinEsch/fix-subtitle-packages
Browse files Browse the repository at this point in the history
[subtitle] fix subtitles archive in archive
  • Loading branch information
DaveTBlake authored Jul 23, 2020
2 parents 11ab683 + 3cd45ac commit 25af320
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions xbmc/Util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1945,6 +1945,14 @@ int CUtil::ScanArchiveForAssociatedItems(const std::string& strArchivePath,
std::string strPathInRar = item->GetPath();
std::string strExt = URIUtils::GetExtension(strPathInRar);

// Check another archive in archive
if (strExt == ".zip" || strExt == ".rar")
{
nItemsAdded +=
ScanArchiveForAssociatedItems(strPathInRar, videoNameNoExt, item_exts, associatedFiles);
continue;
}

// check that the found filename matches the movie filename
size_t fnl = videoNameNoExt.size();
// NOTE: We don't know if videoNameNoExt is URL-encoded, so try both
Expand Down

0 comments on commit 25af320

Please sign in to comment.