MP1-5227: Core: VideoPlayerVMR7: Fix Subtitle Language/Name in case o…

…f difference between current video file and subtitle engine
MediaPortal · Nov 5, 2024 · 4bc6d15 · 4bc6d15
1 parent be30dfa
commit 4bc6d15
Showing 1 changed file with 25 additions and 9 deletions.
diff --git a/mediaportal/Core/Player/VideoPlayerVMR7.cs b/mediaportal/Core/Player/VideoPlayerVMR7.cs
@@ -1849,13 +1849,21 @@ public override string SubtitleLanguage(int iStream)
 
         string strVideNoExt = Path.GetFileNameWithoutExtension(this.m_strCurrentFile);
         string strSubNoExt = Path.GetFileNameWithoutExtension(match.Groups["file"].Value);
-        if (strSubNoExt.Length > strVideNoExt.Length)
-          streamName = strSubNoExt.Substring(strVideNoExt.Length + 1);
-        else
-          streamName = string.Empty;
+        if (strSubNoExt.StartsWith(strVideNoExt, StringComparison.CurrentCultureIgnoreCase))
+        {
+          if (strSubNoExt.Length > strVideNoExt.Length)
+            streamName = strSubNoExt.Substring(strVideNoExt.Length + 1);
+          else
+            streamName = string.Empty;
 
-        if (string.IsNullOrWhiteSpace(streamName))
-          streamName = strVideNoExt;
+          if (string.IsNullOrWhiteSpace(streamName))
+            streamName = strVideNoExt;
+        }
+        else
+        {
+          //difference between m_strCurrentFile and ISubEngine.LoadSubtitles call
+          streamName = strSubNoExt;
+        }
 
         langName = streamName;
         streamNameUND = streamName;
@@ -1946,10 +1954,18 @@ public override string SubtitleName(int iStream)
       {
         string strVideNoExt = Path.GetFileNameWithoutExtension(this.m_strCurrentFile);
         string strSubNoExt = Path.GetFileNameWithoutExtension(match.Groups["file"].Value);
-        if (strSubNoExt.Length > strVideNoExt.Length)
-          streamName = strSubNoExt.Substring(strVideNoExt.Length + 1);
+        if (strSubNoExt.StartsWith(strVideNoExt, StringComparison.CurrentCultureIgnoreCase))
+        {
+          if (strSubNoExt.Length > strVideNoExt.Length)
+            streamName = strSubNoExt.Substring(strVideNoExt.Length + 1);
+          else
+            streamName = string.Empty;
+        }
         else
-          streamName = string.Empty;
+        {
+          //difference between m_strCurrentFile and ISubEngine.LoadSubtitles call
+          streamName = strSubNoExt;
+        }
 
         streamNameFalse = streamName;
         langName = streamName;