diff options
| author | Christian Wieninger <cwieninger@gmx.de> | 2011-02-20 23:01:40 +0100 |
|---|---|---|
| committer | Christian Wieninger <cwieninger@gmx.de> | 2011-02-20 23:01:40 +0100 |
| commit | 184e254b2df8eda05e6dc9765d63e4ae90446c06 (patch) | |
| tree | d14ba6d1e2c95a1ffe8637b6643022b74e71d820 | |
| parent | eb78912fc3abe46f1ca70a89669dea181aa621f8 (diff) | |
| download | vdr-plugin-epgsearch-184e254b2df8eda05e6dc9765d63e4ae90446c06.tar.gz vdr-plugin-epgsearch-184e254b2df8eda05e6dc9765d63e4ae90446c06.tar.bz2 | |
another fix for cloning timers
| -rw-r--r-- | conflictcheck.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/conflictcheck.c b/conflictcheck.c index ac09937..e6f7120 100644 --- a/conflictcheck.c +++ b/conflictcheck.c @@ -46,7 +46,7 @@ cConflictCheckTimerObj::cConflictCheckTimerObj(cTimer* Timer, time_t Start, time cConflictCheckTimerObj::~cConflictCheckTimerObj() { // conflict checks works on a copy of a timer, so delete it again - delete timer; + DELETENULL(timer); } int cConflictCheckTimerObj::Compare(const cListObject &ListObject) const @@ -293,8 +293,7 @@ cList<cConflictCheckTimerObj>* cConflictCheck::CreateCurrentTimerList() } // create a copy of this timer - cTimer* clone = new cTimer; - *clone = *ti; + cTimer* clone = new cTimer(*ti); clone->SetEvent(ti->Event()); cConflictCheckTimerObj* timerObj = new cConflictCheckTimerObj(ti, Start, Start + ti->StopTime() - ti->StartTime(), deviceNr, ti->Index()); |