1 files changed, 10 insertions, 4 deletions
diff --git a/epgelement.c b/epgelement.c
index 2e1d077..8990d60 100644
--- a/epgelement.c
+++ b/epgelement.c
@@ -15,17 +15,23 @@ cEpgElement::~cEpgElement(void) {
 }
 
 void cEpgElement::SetTimer() {
+    hasTimer = false;
     if (config.useRemoteTimers && pRemoteTimers) {
         RemoteTimers_Event_v1_0 rt;
         rt.event = event;
         if (pRemoteTimers->Service("RemoteTimers::GetTimerByEvent-v1.0", &rt))
             hasTimer = true;
-	    else
-	        hasTimer = false;
+#if VDRVERSNUM >= 20301
+    } else {
+        eTimerMatch TimerMatch = tmNone;
+        LOCK_TIMERS_READ;
+        const cTimers *timers = Timers;
+        if (timers->GetMatch(event, &TimerMatch) && (TimerMatch == tmFull))
+            hasTimer = true;
+#else
     } else if (owner->HasTimer()) {
         hasTimer = event->HasTimer();
-    } else {
-        hasTimer = false;
+#endif
     }
 }