diff options
| author | Dave Blake <oak99sky@yahoo.co.uk> | 2020-07-23 13:49:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-23 13:49:35 +0100 |
| commit | 25af32080990fda575d9d2ef7c7d8042b5730e25 (patch) | |
| tree | 1baeda7bb4aea4eddc2b6fc79707d7fa9957819a | |
| parent | 11ab68324478c46012c98d0afbaedf78e0e3572a (diff) | |
| parent | 3cd45acd5a623747c79d0a5219ea1303a5fb0275 (diff) | |
Merge pull request #18201 from AlwinEsch/fix-subtitle-packages
[subtitle] fix subtitles archive in archive
| -rw-r--r-- | xbmc/Util.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp index 5fde1eccf6..4eac37e9e5 100644 --- a/xbmc/Util.cpp +++ b/xbmc/Util.cpp @@ -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 |