From 2a08aea190d9d0b7e4aec87bacd0a3f69b73ccf7 Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Thu, 10 Feb 2011 19:08:42 +0100 Subject: conflict check after manual timer programming was broken --- conflictcheck.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflictcheck.c b/conflictcheck.c index dceb36c..fd13fa7 100644 --- a/conflictcheck.c +++ b/conflictcheck.c @@ -674,7 +674,7 @@ bool cConflictCheck::TimerInConflict(cTimer* timer) { for (it2 = (*it)->concurrentTimers->begin(); it2 != (*it)->concurrentTimers->end(); it2++) { - if ((*it2)->timer == timer) + if ((*it2)->OrigTimer() == timer) return true; } } -- cgit v1.2.3