From eb78912fc3abe46f1ca70a89669dea181aa621f8 Mon Sep 17 00:00:00 2001
From: Christian Wieninger <cwieninger@gmx.de>
Date: Sun, 20 Feb 2011 12:09:53 +0100
Subject: 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

---
 conflictcheck.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'conflictcheck.c')

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());
-- 
cgit v1.2.3