diff options
| -rw-r--r-- | conflictcheck.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } } |