Index: libs/libmythtv/dvbchannel.cpp
===================================================================
--- libs/libmythtv/dvbchannel.cpp	(revision 8252)
+++ libs/libmythtv/dvbchannel.cpp	(working copy)
@@ -236,6 +236,22 @@
 
     inputChannel[currentcapchannel] = curchannelname;
 
+    QString inputName;
+    if (pParent && !pParent->CheckChannel(this, chan, inputName))
+    {       
+        VERBOSE(VB_IMPORTANT, QString(
+                    "CheckChannel failed. Please verify "
+                    "channel \"%2\" in the \"mythtv-setup\" Channel Editor.").
+                arg(chan));
+        return false;
+    }
+
+    // If CheckChannel filled in the inputName then we need to
+    // change inputs and return, since the act of changing
+    // inputs will change the channel as well.
+    if (!inputName.isEmpty())
+        channelnames[currentcapchannel] = inputName;
+
     return true;
 }