Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Nexus] Predictive tuning: Fix crash when starting playback #655

Merged
merged 2 commits into from
Mar 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pvr.hts/addon.xml.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="pvr.hts"
version="20.7.1"
version="20.7.2"
name="Tvheadend HTSP Client"
provider-name="Adam Sutton, Sam Stenvall, Lars Op den Kamp, Kai Sommerfeld">
<requires>@ADDON_DEPENDS@</requires>
Expand Down
4 changes: 4 additions & 0 deletions pvr.hts/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
v20.7.2
- Predictive tuning: Fix crash when starting playback of a channel which has no unique channel number
(tvh does not prevent duplicate channel numbers).

v20.7.1
- Translations updates from Weblate
- af_za, ca_es, cs_cz, da_dk, en_nz, es_es, es_mx, fi_fi, fr_ca, fr_fr, hr_hr, hu_hu, is_is, it_it, ko_kr, mk_mk, nb_no, nl_nl, pt_br, pt_pt, ro_ro, ru_ru, sk_sk, sl_si, sr_rs, sr_rs@latin, sv_se, tr_tr, zh_cn, zh_tw
Expand Down
6 changes: 5 additions & 1 deletion src/tvheadend/ChannelTuningPredictor.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,11 @@ struct SortChannelPair
{
bool operator()(const ChannelPair& left, const ChannelPair& right) const
{
return left.second < right.second;
if (left.second < right.second)
return true;

// if channel numbers are equal, consider channel id (which is unique)
return left.first < right.first;
}
};
} // namespace predictivetune
Expand Down