Ticket #1668: 9669_fix.patch

libs/libmythtv/mpeg/mpegdescriptors.cpp

@@ -93 +93 @@
     {
         if (DescriptorID::short_event == parsed[i][0])
         {
-            ShortEventDescriptor sed(parsed[unmatched_idx]);
+            ShortEventDescriptor sed(parsed[i]);
             QMap<uint,uint>::const_iterator it =
                 langPrefs.find(sed.CanonicalLanguageKey());
 
@@ -101 +101 @@
             {
                 match_idx = i;
                 match_pri = *it;
+                continue;
             }
 
             if (unmatched_idx < 0)
@@ -109 +110 @@
     }
 
     if (match_pri)
-        return parsed[match_pri];
+        return parsed[match_idx];
 
     if ((desc_tag == DescriptorID::short_event) && (unmatched_idx >= 0))
     {
@@ -133 +134 @@
     {
         if (DescriptorID::extended_event == parsed[i][0])
         {
-            ExtendedEventDescriptor eed(parsed[unmatched_idx]);
+            ExtendedEventDescriptor eed(parsed[i]);
             QMap<uint,uint>::const_iterator it =
                 langPrefs.find(eed.CanonicalLanguageKey());
 
@@ -141 +142 @@
             {
                 match_key = eed.LanguageKey();
                 match_pri = *it;
+                continue;
             }
 
             if (unmatched_idx < 0)