Ticket #3618: 3618-v1.patch

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -3299 +3299 @@
     VERBOSE(VB_PLAYBACK, "JumpToProgram(void)");
     bool discontinuity = false, newtype = false;
     int newid = -1;
+    long long nextpos = player_ctx->tvchain->GetJumpPos();
     ProgramInfo *pginfo = player_ctx->tvchain->GetSwitchProgram(
         discontinuity, newtype, newid);
     if (!pginfo)
         return;
 
-    long long nextpos = player_ctx->tvchain->GetJumpPos();
     bool newIsDummy = player_ctx->tvchain->GetCardType(newid) == "DUMMY";
 
     SetPlayingInfo(*pginfo);

libs/libmythtv/livetvchain.cpp

@@ -376 +376 @@
     QMutexLocker lock(&m_lock);
 
     if (m_switchid < 0 || m_curpos == m_switchid)
+    {
+        ClearSwitch();
         return NULL;
+    }
 
     LiveTVChainEntry oldentry, entry;
     GetEntryAt(m_curpos, oldentry);
@@ -397 +400 @@
     }
 
     if (!pginfo)
+    {
+        ClearSwitch();
         return NULL;
+    }
 
     // Skip dummy recordings, if possible.
     if (entry.cardtype == "DUMMY")
@@ -411 +417 @@
         delete pginfo;
         pginfo = EntryToProgram(entry);
         if (!pginfo)
+        {
+            ClearSwitch();
             return NULL;
+        }
     }
 
     discont = true;
@@ -432 +441 @@
     }
 
     newid = m_switchid;
-    m_switchid = -1;
 
+    ClearSwitch();
+
     return pginfo;
 }