summaryrefslogtreecommitdiff
path: root/timers.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2017-11-09 12:22:20 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2017-11-09 12:22:20 +0100
commitbc3b6ed601f37fa6b2cfb7dec9e39439590be6b3 (patch)
tree68598302da4a7dea2e0f9f5bf8ceb9c3ab86a280 /timers.c
parent33bbff2aa5a7d84c2d3132f48f18abefcee68dee (diff)
downloadvdr-bc3b6ed601f37fa6b2cfb7dec9e39439590be6b3.tar.gz
vdr-bc3b6ed601f37fa6b2cfb7dec9e39439590be6b3.tar.bz2
Local timers are now preferred over remote timers in the Schedules menu
Diffstat (limited to 'timers.c')
-rw-r--r--timers.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/timers.c b/timers.c
index bc894cc0..6859eece 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: timers.c 4.12 2017/10/31 09:41:31 kls Exp $
+ * $Id: timers.c 4.13 2017/11/09 12:10:46 kls Exp $
*/
#include "timers.h"
@@ -792,10 +792,10 @@ 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) {
+ if (tm > m || tm == tmFull && ti->Local()) {
t = ti;
m = tm;
- if (m == tmFull)
+ if (m == tmFull && ti->Local())
break;
}
}