Ticket #2646: iptvchannel.diff

libs/libmythtv/iptvchannel.cpp

@@ -131 +131 @@
 
     // Set the channel..
     curchannelname = channum;
-    currentProgramNum = 1;
 
+    InputMap::const_iterator it = inputs.find(currentInputID);
+    if (it == inputs.end())
+    {
+        VERBOSE(VB_IMPORTANT, QString("error input not found:"));
+        return false;
+    }
+    int sourceid = (*it)->sourceid;
+
+    MSqlQuery query(MSqlQuery::InitCon());
+    query.prepare(
+        "SELECT serviceid "
+        "FROM channel "
+        "WHERE channum  = :CHANNUM AND "
+        "      sourceid = :SOURCEID");
+
+    query.bindValue(":CHANNUM",  channum);
+    query.bindValue(":SOURCEID", sourceid);
+
+    if (!query.exec() || !query.isActive())
+    {
+        MythContext::DBError("fetching chaninfo", query);
+        VERBOSE(VB_IMPORTANT, QString("error in DB:"));
+        return false;
+    }
+
+    while (query.next())
+    {
+        currentProgramNum = query.value(0).toUInt();
+    }
+
     VERBOSE(VB_CHANNEL, LOC + "SetChannelByString() -- end");
     return true;
 }