Ticket #10280: browse.2.patch

libs/libmythtv/tv_play.cpp

@@ -6861 +6861 @@
         if (browsehelper->IsBrowsing())
         {
             uint sourceid = 0;
             ctx->LockPlayingInfo(__FILE__, __LINE__);
             if (ctx->playingInfo)
-                sourceid = ctx->playingInfo->GetSourceID();
+            {
+                uint id = ctx->playingInfo->GetChanID();
+                sourceid = ChannelUtil::GetSourceIDForChannel(id);
+            }
             ctx->UnlockPlayingInfo(__FILE__, __LINE__);
 
             commited = true;
             if (channum.isEmpty())
                 channum = browsehelper->GetBrowsedInfo().m_channum;

libs/libmythtv/tvbrowsehelper.cpp

@@ -47 +47 @@
     m_ctx(NULL),
     m_chanid(0),
     m_run(true)
 {
     db_all_channels = ChannelUtil::GetChannels(
-        0, true, "channum, callsign");
+        0, true, "channum, callsign, cardid");
     ChannelUtil::SortChannels(
         db_all_channels, db_channel_ordering, false);
 
     DBChanList::const_iterator it = db_all_channels.begin();
     for (; it != db_all_channels.end(); ++it)