summaryrefslogtreecommitdiff
path: root/conflictcheck.c
diff options
context:
space:
mode:
authorChristian Wieninger <cwieninger@gmx.de>2011-02-20 12:09:53 +0100
committerChristian Wieninger <cwieninger@gmx.de>2011-02-20 12:09:53 +0100
commiteb78912fc3abe46f1ca70a89669dea181aa621f8 (patch)
treebfaa6d002eb02a35c1d5a476d4ee5bff9e5e20c1 /conflictcheck.c
parent2a08aea190d9d0b7e4aec87bacd0a3f69b73ccf7 (diff)
downloadvdr-plugin-epgsearch-eb78912fc3abe46f1ca70a89669dea181aa621f8.tar.gz
vdr-plugin-epgsearch-eb78912fc3abe46f1ca70a89669dea181aa621f8.tar.bz2
possible fix for crash in CheckManualTimers. Cloning the times in conflictcheck now uses VDRs copy constructor to ensure that 'aux' is a real copy of the one in the original timer
Diffstat (limited to 'conflictcheck.c')
-rw-r--r--conflictcheck.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/conflictcheck.c b/conflictcheck.c
index fd13fa7..ac09937 100644
--- a/conflictcheck.c
+++ b/conflictcheck.c
@@ -241,8 +241,7 @@ cList<cConflictCheckTimerObj>* cConflictCheck::CreateCurrentTimerList()
int deviceNr = gl_recStatusMonitor->TimerRecDevice(ti)-1;
// 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(clone, ti->StartTime(), ti->StopTime(), deviceNr, ti->Index());