Ticket #2206: channelbase_browse_mode.diff

channelbase.cpp

@@ -74 +74 @@
 
 uint ChannelBase::GetNextChannel(const QString &channum, int direction) const
 {
+/*
     InputMap::const_iterator it = inputs.find(currentInputID);
     if (it == inputs.end())
         return 0;
 
     uint chanid = ChannelUtil::GetChanID((*it)->sourceid, channum);
+*/
+    // Problem: In 'browse mode' when we transition to a different inputid the
+    // currentInputID and curchannelname are not updated correctly(?) and can't be used.
+    // Soln: Use allchannels to get the chanid from the channum.
+    uint chanid = 0;
+    DBChanList::const_iterator it = allchannels.begin();
+    while (it != allchannels.end())
+    {
+        if (it->channum == channum)
+        {
+            chanid = it->chanid;
+            break;
+        }
+        it++;
+    }
     return GetNextChannel(chanid, direction);
 }