Ticket #10136: programdata.cpp.diff

mythtv/libs/libmythtv/programdata.cpp

@@ -613 +613 @@
     return true;
 }
 
+static bool program_exists(MSqlQuery &query, uint chanid, const QDateTime &st)
+{
+    query.prepare(
+        "SELECT title FROM program "
+        "WHERE chanid    = :CHANID AND "
+        "      starttime = :OLDSTART");
+    query.bindValue(":CHANID",   chanid);
+    query.bindValue(":OLDSTART", st);
+    if (!query.exec())
+    {
+        MythDB::DBError("program_exists", query);
+    }
+    if (query.next())
+    {
+        return true;
+    }
+    return false;
+}
+
 static bool change_program(MSqlQuery &query, uint chanid, const QDateTime &st,
                            const QDateTime &new_st, const QDateTime &new_end)
 {
@@ -670 +689 @@
     else if (prog.starttime < endtime && prog.endtime > endtime)
     {
         // starts during, but ends after our program
+        if (program_exists(query, chanid, endtime))
+        {
+            LOG(VB_EIT, LOG_DEBUG,
+                QString("Deleting program '%1'").arg(prog.title));
+            return delete_program(query, chanid, prog.starttime);
+        }
         return change_program(query, chanid, prog.starttime,
                               endtime, prog.endtime);
     }