Index: libs/libmythtv/tv_play.cpp
===================================================================
--- libs/libmythtv/tv_play.cpp	(revision 7529)
+++ libs/libmythtv/tv_play.cpp	(working copy)
@@ -2965,7 +2969,7 @@
         GetOSD()->SetText("channel_number", infoMap, 2);
     }
 
-    if (do_smart)
+    if (do_smart && StateIsLiveTV(GetState()))
         ChannelCommit();
 }
 
@@ -2973,6 +2977,11 @@
 {
     if (!channelqueued)
         return;
+    if (!StateIsLiveTV(GetState()))
+    {
+        ChannelClear();
+        return;
+    }
 
     QString chan = QueuedChannel();