diff options
| author | Christian Wieninger <cwieninger@gmx.de> | 2011-01-12 19:35:01 +0100 |
|---|---|---|
| committer | Christian Wieninger <cwieninger@gmx.de> | 2011-01-12 19:35:01 +0100 |
| commit | d757ac880840938594528923fbaa8cc644d0b352 (patch) | |
| tree | 676d4f6c8d37c4d866e1e2589b897d1d6d0b5c39 /conflictcheck.h | |
| parent | 6f1e31ad8775caf30dacf56a964c5ee7351f7feb (diff) | |
| download | vdr-plugin-epgsearch-d757ac880840938594528923fbaa8cc644d0b352.tar.gz vdr-plugin-epgsearch-d757ac880840938594528923fbaa8cc644d0b352.tar.bz2 | |
conflict check now works on a copy of timers to prevent a crash when timers are deleted while the check runs
Diffstat (limited to 'conflictcheck.h')
| -rw-r--r-- | conflictcheck.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/conflictcheck.h b/conflictcheck.h index ea86fb0..307883b 100644 --- a/conflictcheck.h +++ b/conflictcheck.h @@ -43,6 +43,7 @@ class cConflictCheckTimerObj : public cTimerObj time_t start; time_t stop; int device; + int origIndex; int recDuration; time_t lastRecStart; time_t lastRecStop; @@ -50,7 +51,9 @@ class cConflictCheckTimerObj : public cTimerObj std::set<cConflictCheckTimerObj*,TimerObjSort>* concurrentTimers; bool ignore; - cConflictCheckTimerObj(cTimer* Timer, time_t Start, time_t Stop, int Device = -1); + + cConflictCheckTimerObj(cTimer* Timer, time_t Start, time_t Stop, int Device = -1, int OrigIndex=-1); + ~cConflictCheckTimerObj(); int Compare(const cListObject &ListObject) const; const cEvent* Event(); const cEvent* SetEventFromSchedule(); |