Anonymous

Index: libs/libmythtv/channelutil.cpp
===================================================================
--- libs/libmythtv/channelutil.cpp      (revision 15496)
+++ libs/libmythtv/channelutil.cpp      (working copy)
@@ -456,7 +456,7 @@
     MSqlQuery query(MSqlQuery::InitCon());
     /* See if mplexid is already in the database */
     query.prepare(
-        "SELECT mplexid "
+        "SELECT DISTINCT mplexid "
         "FROM channel "
         "WHERE sourceid  = :SOURCEID  AND "
         "      channum   = :CHANNUM");
@@ -817,7 +817,7 @@
     int input_id = -1;

     MSqlQuery query(MSqlQuery::InitCon());
-    query.prepare("SELECT cardinputid"
+    query.prepare("SELECT DISTINCT cardinputid"
                   " FROM cardinput"
                   " WHERE sourceid = :SOURCEID"
                   " AND cardid = :CARDID");
@@ -841,7 +841,7 @@

     query.prepare(
         QString(
-            "SELECT channel.%1 "
+            "SELECT DISTINCT channel.%1 "
             "FROM channel, capturecard, cardinput "
             "WHERE channel.channum      = :CHANNUM           AND "
             "      channel.sourceid     = cardinput.sourceid AND "
@@ -872,7 +872,7 @@

     query.prepare(
         QString(
-            "SELECT channel.%1 "
+            "SELECT DISTINCT channel.%1 "
             "FROM channel "
             "WHERE channum  = :CHANNUM AND "
             "      sourceid = :SOURCEID")
Index: libs/libmythtv/channelbase.cpp
===================================================================
--- libs/libmythtv/channelbase.cpp      (revision 15496)
+++ libs/libmythtv/channelbase.cpp      (working copy)
@@ -686,7 +686,7 @@

     MSqlQuery query(MSqlQuery::InitCon());

-    query.prepare("SELECT chanid FROM channel "
+    query.prepare("SELECT DISTINCT chanid FROM channel "
                   "WHERE channum  = :CHANNUM AND "
                   "      sourceid = :SOURCEID");
     query.bindValue(":CHANNUM", curchannelname);
@@ -868,7 +868,7 @@
         return false;

     query.prepare(
-        "SELECT channel.chanid "
+        "SELECT DISTINCT channel.chanid "
         "FROM channel, capturecard, cardinput "
         "WHERE channel.channum      = :CHANNUM           AND "
         "      channel.sourceid     = cardinput.sourceid AND "
@@ -897,7 +897,7 @@

     // We didn't find it on the current input let's widen the search
     query.prepare(
-        "SELECT channel.chanid, cardinput.inputname "
+        "SELECT DISTINCT channel.chanid, cardinput.inputname "
         "FROM channel, capturecard, cardinput "
         "WHERE channel.channum      = :CHANNUM           AND "
         "      channel.sourceid     = cardinput.sourceid AND "