[mythtv] changes to conflict resolution
Matt Zimmerman
mdz at debian.org
Thu Jun 5 01:21:22 EDT 2003
Does this look about like what you had?
--
- mdz
--- scheduler.cpp.~1.24.~ 2003-05-23 22:42:31.000000000 -0400
+++ scheduler.cpp 2003-06-05 00:20:27.000000000 -0400
@@ -379,21 +379,9 @@
else if (first->IsSameProgram(*second))
{
if (second->conflicting && !first->conflicting)
- {
- delete second;
- deliter = j.base();
- j++;
- deliter--;
- recordingList.erase(deliter);
- }
+ second->recording = false;
else
- {
- delete first;
- deliter = i.base();
- deliter--;
- recordingList.erase(deliter);
- break;
- }
+ first->recording = false;
}
}
}
More information about the mythtv-dev
mailing list