diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2021-01-15 13:52:40 +0100 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2021-01-15 13:52:40 +0100 |
commit | d78d6fba7e0079712abc58e85fd441c625bb82b6 (patch) | |
tree | 32a35d401d630c7fe1016827eecfd1ab6b7ef27e /timers.c | |
parent | 80bdc9065093caca1c1da7373dd25a6b52bb5774 (diff) | |
download | vdr-d78d6fba7e0079712abc58e85fd441c625bb82b6.tar.gz vdr-d78d6fba7e0079712abc58e85fd441c625bb82b6.tar.bz2 |
Spawned timers are now preferred over pattern timers in the Schedule menu
Diffstat (limited to 'timers.c')
-rw-r--r-- | timers.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: timers.c 5.3 2021/01/14 10:29:05 kls Exp $ + * $Id: timers.c 5.4 2021/01/15 13:52:40 kls Exp $ */ #include "timers.h" @@ -1020,11 +1020,9 @@ const cTimer *cTimers::GetMatch(const cEvent *Event, eTimerMatch *Match) const eTimerMatch m = tmNone; for (const cTimer *ti = First(); ti; ti = Next(ti)) { eTimerMatch tm = ti->Matches(Event); - if (tm > m || tm == tmFull && ti->Local()) { + if (tm > m || tm == tmFull && t && (t->Remote() && ti->Local() || t->IsPatternTimer() && ti->HasFlags(tfSpawned))) { t = ti; m = tm; - if (m == tmFull && ti->Local()) - break; } } if (Match) |