summaryrefslogtreecommitdiff
path: root/timers.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2013-03-29 15:37:16 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2013-03-29 15:37:16 +0100
commit965feab54f2f8d88a865df6db137e3576f479368 (patch)
tree1764eee622accf0a42d5a374400375586d722f71 /timers.c
parentf30ac5075e6420eb82657a99cb8232aaca23a116 (diff)
downloadvdr-965feab54f2f8d88a865df6db137e3576f479368.tar.gz
vdr-965feab54f2f8d88a865df6db137e3576f479368.tar.bz2
Fixed handling overlapping pending timers
Diffstat (limited to 'timers.c')
-rw-r--r--timers.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/timers.c b/timers.c
index 279f5532..9a880e10 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 2.17 2013/03/16 10:37:10 kls Exp $
+ * $Id: timers.c 2.18 2013/03/29 15:37:16 kls Exp $
*/
#include "timers.h"
@@ -720,8 +720,10 @@ cTimer *cTimers::GetMatch(time_t t)
for (cTimer *ti = First(); ti; ti = Next(ti)) {
if (!ti->Recording() && ti->Matches(t)) {
if (ti->Pending()) {
- if (ti->Index() > LastPending)
+ if (ti->Index() > LastPending) {
LastPending = ti->Index();
+ return ti;
+ }
else
continue;
}