Skip to content
Browse files

fixed: don't load non-matching archived subtitles (fixes #12719)

Commit ea87f7e ("removed subtitle caching as it was only needed
on xbox, partialy takes care of #9736.") mistakenly removed the filename
check for subtitles in zip or rar archives, causing any subtitle file
inside archives to be loaded.

Fix that by re-adding a filename check into
  • Loading branch information...
1 parent 581e051 commit f4d11b09d93df4021bfca702131dafd631df3287 @anssih anssih committed Mar 16, 2012
Showing with 6 additions and 1 deletion.
  1. +6 −1 xbmc/Util.cpp
7 xbmc/Util.cpp
@@ -2459,7 +2459,12 @@ int CUtil::ScanArchiveForSubtitles( const CStdString& strArchivePath, const CStd
// done checking if this is a rar-in-rar
+ // check that the found filename matches the movie filename
+ int fnl = strMovieFileNameNoExt.size();
+ if (!URIUtils::GetFileName(strPathInRar).Left(fnl).Equals(strMovieFileNameNoExt))
+ continue;
int iPos=0;
while (sub_exts[iPos])

0 comments on commit f4d11b0

Please sign in to comment.
Something went wrong with that request. Please try again.