Merge pull request #654 from ksooo/fix-predictive-tuning

Predictive tuning: Fix crash when starting playback
kodi-pvr · Mar 3, 2024 · 0effdb6 · 0effdb6
2 parents 29bc885 + 55d58da
commit 0effdb6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/pvr.hts/addon.xml.in b/pvr.hts/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.hts"
-  version="21.2.0"
+  version="21.2.1"
   name="Tvheadend HTSP Client"
   provider-name="Adam Sutton, Sam Stenvall, Lars Op den Kamp, Kai Sommerfeld">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/pvr.hts/changelog.txt b/pvr.hts/changelog.txt
@@ -1,3 +1,7 @@
+v21.2.1
+- Predictive tuning: Fix crash when starting playback of a channel which has no unique channel number
+  (tvh does not prevent duplicate channel numbers).
+
 v21.2.0
 - Add setting for threshold for reconnect on stalled streams
 

diff --git a/src/tvheadend/ChannelTuningPredictor.h b/src/tvheadend/ChannelTuningPredictor.h
@@ -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