diff options
| author | Christian Wieninger <cwieninger@gmx.de> | 2011-02-10 19:08:42 +0100 |
|---|---|---|
| committer | Christian Wieninger <cwieninger@gmx.de> | 2011-02-10 19:08:42 +0100 |
| commit | 2a08aea190d9d0b7e4aec87bacd0a3f69b73ccf7 (patch) | |
| tree | 552c99a8770d4d633bb7c1e6809f2d1b957acf6d /conflictcheck.c | |
| parent | 5d66e825f79753f2b1a3da4fd3f7d431a8a37b15 (diff) | |
| download | vdr-plugin-epgsearch-2a08aea190d9d0b7e4aec87bacd0a3f69b73ccf7.tar.gz vdr-plugin-epgsearch-2a08aea190d9d0b7e4aec87bacd0a3f69b73ccf7.tar.bz2 | |
conflict check after manual timer programming was broken
Diffstat (limited to 'conflictcheck.c')
| -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; } } |