fixed: External subs in (local) custom folder did not work with url e…

…ncoded files
mkortstiege · Feb 3, 2015 · a10def9 · a10def9
1 parent e72860f
commit a10def9
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp
@@ -2025,8 +2025,11 @@ void CUtil::ScanForExternalSubtitles(const std::string& strMovie, std::vector<st
       {
         std::string strSubtitlePath;
         URIUtils::Split(items[j]->GetPath(), strSubtitlePath, strItem);
+
+        // Make sure filename uses the correct encoding
+        std::string strMovieFileNameNoExt2 = URIUtils::ChangeBasePath(strMoviePath, strMovieFileNameNoExt, strSubtitlePath, false);
 
-        if (StringUtils::StartsWithNoCase(strItem, strMovieFileNameNoExt)
+        if (StringUtils::StartsWithNoCase(strItem, strMovieFileNameNoExt2)
           || (!isoFileNameNoExt.empty() && StringUtils::StartsWithNoCase(strItem, isoFileNameNoExt)))
         {
           // is this a rar or zip-file
@@ -2053,8 +2056,11 @@ void CUtil::ScanForExternalSubtitles(const std::string& strMovie, std::vector<st
           // is this a rar or zip-file
           if (URIUtils::IsRAR(strItem) || URIUtils::IsZIP(strItem))
           {
+            // Make sure filename uses the correct encoding
+            std::string strMovieFileNameNoExt2 = URIUtils::ChangeBasePath(strMoviePath, strMovieFileNameNoExt, "", false);
+
             // check strMovieFileNameNoExt in zip-file
-            ScanArchiveForSubtitles( items[j]->GetPath(), strMovieFileNameNoExt, vecSubtitles );
+            ScanArchiveForSubtitles(items[j]->GetPath(), strMovieFileNameNoExt2, vecSubtitles );
           }
         }
       }