=== libs/libmythtv/mpeg/mpegdescriptors.cpp
==================================================================
|
|
|
93 | 93 | { |
94 | 94 | if (DescriptorID::short_event == parsed[i][0]) |
95 | 95 | { |
96 | | ShortEventDescriptor sed(parsed[unmatched_idx]); |
| 96 | ShortEventDescriptor sed(parsed[i]); |
97 | 97 | QMap<uint,uint>::const_iterator it = |
98 | 98 | langPrefs.find(sed.CanonicalLanguageKey()); |
99 | 99 | |
… |
… |
|
101 | 101 | { |
102 | 102 | match_idx = i; |
103 | 103 | match_pri = *it; |
| 104 | continue; |
104 | 105 | } |
105 | 106 | |
106 | 107 | if (unmatched_idx < 0) |
… |
… |
|
109 | 110 | } |
110 | 111 | |
111 | 112 | if (match_pri) |
112 | | return parsed[match_pri]; |
| 113 | return parsed[match_idx]; |
113 | 114 | |
114 | 115 | if ((desc_tag == DescriptorID::short_event) && (unmatched_idx >= 0)) |
115 | 116 | { |
… |
… |
|
133 | 134 | { |
134 | 135 | if (DescriptorID::extended_event == parsed[i][0]) |
135 | 136 | { |
136 | | ExtendedEventDescriptor eed(parsed[unmatched_idx]); |
| 137 | ExtendedEventDescriptor eed(parsed[i]); |
137 | 138 | QMap<uint,uint>::const_iterator it = |
138 | 139 | langPrefs.find(eed.CanonicalLanguageKey()); |
139 | 140 | |
… |
… |
|
141 | 142 | { |
142 | 143 | match_key = eed.LanguageKey(); |
143 | 144 | match_pri = *it; |
| 145 | continue; |
144 | 146 | } |
145 | 147 | |
146 | 148 | if (unmatched_idx < 0) |