Advertisement
Guest User

Untitled

a guest
Sep 4th, 2013
54
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.25 KB | None | 0 0
  1. diff --git a/mythtv/libs/libmyth/programinfo.cpp b/mythtv/libs/libmyth/programinfo.cpp
  2. index 9854e12..6488c05 100644
  3. --- a/mythtv/libs/libmyth/programinfo.cpp
  4. +++ b/mythtv/libs/libmyth/programinfo.cpp
  5. @@ -2027,9 +2027,6 @@ bool ProgramInfo::IsSameProgram(const ProgramInfo& other) const
  6. if (dupmethod & kDupCheckNone)
  7. return false;
  8.  
  9. - if (title.compare(other.title, Qt::CaseInsensitive) != 0)
  10. - return false;
  11. -
  12. if (catType == kCategorySeries)
  13. {
  14. if (programid.endsWith("0000"))
  15. @@ -2052,6 +2049,9 @@ bool ProgramInfo::IsSameProgram(const ProgramInfo& other) const
  16. }
  17. }
  18.  
  19. + if (title.compare(other.title, Qt::CaseInsensitive) != 0)
  20. + return false;
  21. +
  22. if ((dupmethod & kDupCheckSub) &&
  23. ((subtitle.isEmpty()) ||
  24. (subtitle.compare(other.subtitle, Qt::CaseInsensitive) != 0)))
  25. diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp
  26. index dbb2be3..b21cc00 100644
  27. --- a/mythtv/programs/mythbackend/scheduler.cpp
  28. +++ b/mythtv/programs/mythbackend/scheduler.cpp
  29. @@ -3690,7 +3690,6 @@ void Scheduler::UpdateDuplicates(void)
  30. " ( "
  31. " RECTABLE.dupmethod > 1 AND "
  32. " oldrecorded.duplicate <> 0 AND "
  33. -" p.title = oldrecorded.title AND "
  34. " p.generic = 0 "
  35. " AND "
  36. " ( "
  37. @@ -3705,6 +3704,7 @@ void Scheduler::UpdateDuplicates(void)
  38. " (p.programid = '' OR oldrecorded.programid = '') " )
  39. + QString(
  40. " AND "
  41. +" p.title = oldrecorded.title AND "
  42. " (((RECTABLE.dupmethod & 0x02) = 0) OR (p.subtitle <> '' "
  43. " AND p.subtitle = oldrecorded.subtitle)) "
  44. " AND "
  45. @@ -3727,7 +3727,6 @@ void Scheduler::UpdateDuplicates(void)
  46. " ( "
  47. " RECTABLE.dupmethod > 1 AND "
  48. " recorded.duplicate <> 0 AND "
  49. -" p.title = recorded.title AND "
  50. " p.generic = 0 AND "
  51. " recorded.recgroup NOT IN ('LiveTV','Deleted') "
  52. " AND "
  53. @@ -3743,6 +3742,7 @@ void Scheduler::UpdateDuplicates(void)
  54. " (p.programid = '' OR recorded.programid = '') ")
  55. + QString(
  56. " AND "
  57. +" p.title = recorded.title AND "
  58. " (((RECTABLE.dupmethod & 0x02) = 0) OR (p.subtitle <> '' "
  59. " AND p.subtitle = recorded.subtitle)) "
  60. " AND "
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement