Ticket #3618: mythtv_tvchain_clearswitch.diff

libs/libmythtv/livetvchain.cpp

@@ -374 +374 @@
 ProgramInfo *LiveTVChain::GetSwitchProgram(bool &discont, bool &newtype, 
                                            int &newid)
 {
+    LiveTVChainEntry oldentry, entry;
+    ProgramInfo *pginfo = NULL;
+
     QMutexLocker lock(&m_lock);
 
     if (m_switchid < 0 || m_curpos == m_switchid)
-        return NULL;
+        goto clearswitch;
 
-    LiveTVChainEntry oldentry, entry;
     GetEntryAt(m_curpos, oldentry);
 
-    ProgramInfo *pginfo = NULL;
     while (!pginfo && m_switchid < (int)m_chain.count() && m_switchid >= 0)
     {
         GetEntryAt(m_switchid, entry);
@@ -398 +399 @@
     }
 
     if (!pginfo)
-        return NULL;
+        goto clearswitch;
 
     // Skip dummy recordings, if possible.
     if (entry.cardtype == "DUMMY")
@@ -413 +414 @@
     }
 
     if (!pginfo)
-        return NULL;
+        goto clearswitch;
 
     discont = true;
     if (m_curpos == m_switchid - 1)
@@ -433 +434 @@
     }
 
     newid = m_switchid;
-    m_switchid = -1;
 
+clearswitch:
+    ClearSwitch();
+
     return pginfo;
 }