Ticket #4793: mythtv_tvchain_pginfo_leak2.diff

libs/libmythtv/livetvchain.cpp

@@ -401 +401 @@
         return NULL;
 
     // Skip dummy recordings, if possible.
-    if (entry.cardtype == "DUMMY")
+    if (entry.cardtype == "DUMMY" &&
+        m_switchid != m_curpos)
     {
         if (m_switchid > m_curpos && m_switchid + 1 < (int)m_chain.count())
             m_switchid++;
@@ -409 +410 @@
             m_switchid--;
 
         GetEntryAt(m_switchid, entry);
+        delete pginfo;
         pginfo = EntryToProgram(entry);
+
+        if (!pginfo)
+            return NULL;
     }
 
-    if (!pginfo)
-        return NULL;
-
     discont = true;
     if (m_curpos == m_switchid - 1)
         discont = entry.discontinuity;