Sophie

Sophie

distrib > * > 2008.0 > x86_64 > by-pkgid > da95e7e5c21cf72a778ff56c7941399c > files > 20

vdr-1.6.0-4mdv2008.0.src.rpm

Index: vdr-1.6.0-57/device.c
===================================================================
--- vdr-1.6.0-57/device.c
+++ vdr-1.6.0-57/device.c	2008-05-04 18:33:18.000000000 +0300
@@ -1100,7 +1100,9 @@
      int LanguagePreference = INT_MAX; // higher than the maximum possible value
      for (int i = ttSubtitleFirst; i <= ttSubtitleLast; i++) {
          const tTrackId *TrackId = GetTrack(eTrackType(i));
-         if (TrackId && TrackId->id && I18nIsPreferredLanguage(Setup.SubtitleLanguages, TrackId->language, LanguagePreference))
+         // Fall back to languageless ttSubtitleFirst+8 track created by old subtitles patch if present
+         if (TrackId && TrackId->id && (I18nIsPreferredLanguage(Setup.SubtitleLanguages, TrackId->language, LanguagePreference)
+             || ((i == ttSubtitleFirst + 8) && !(*TrackId->language) && LanguagePreference == INT_MAX)))
             PreferredTrack = eTrackType(i);
          }
      // Make sure we're set to an available subtitle track: