Ticket #5348: titledup1.patch

programs/mythbackend/scheduler.cpp

@@ -2657 +2657 @@
 " LEFT JOIN oldrecorded ON "
 "  ( "
 "    RECTABLE.dupmethod > 1 AND "
-"    oldrecorded.duplicate <> 0 AND "
-"    program.title = oldrecorded.title "
+"    oldrecorded.duplicate <> 0 "
 "     AND "
 "     ( "
 "      (program.programid <> '' AND program.generic = 0 "
 "       AND program.programid = oldrecorded.programid) "
 "      OR "
-"      (oldrecorded.findid <> 0 AND "
-"        oldrecorded.findid = ") + progfindid + QString(") "
+"      (program.title = oldrecorded.title AND "
+"       oldrecorded.findid <> 0 AND "
+"       oldrecorded.findid = ") + progfindid + QString(") "
 "      OR "
 "      ( "
+"       program.title = oldrecorded.title AND "
 "       program.generic = 0 "
 "       AND "
 "       (program.programid = '' OR oldrecorded.programid = '') "
@@ -2689 +2690 @@
 "  ( "
 "    RECTABLE.dupmethod > 1 AND "
 "    recorded.duplicate <> 0 AND "
-"    program.title = recorded.title AND "
 "    recorded.recgroup NOT IN ('LiveTV','Deleted') "
 "     AND "
 "     ( "
 "      (program.programid <> '' AND program.generic = 0 "
 "       AND program.programid = recorded.programid) "
 "      OR "
-"      (recorded.findid <> 0 AND "
-"        recorded.findid = ") + progfindid + QString(") "
+"      (program.title = recorded.title AND "
+"       recorded.findid <> 0 AND "
+"       recorded.findid = ") + progfindid + QString(") "
 "      OR "
 "      ( "
+"       program.title = recorded.title AND "
 "       program.generic = 0 "
 "       AND "
 "       (program.programid = '' OR recorded.programid = '') "