Don't mix local and remote concurrent timers

Adjust nextRelevantConflictDate for remote conflicts
Ignore remote conflicts in EpgsearchServiceHandler

1 files changed, 1 insertions, 0 deletions

diff --git a/services.c b/services.c
index 2013a38..31749f2 100644
--- a/services.c
+++ b/services.c
@@ -262,6 +262,7 @@ std::list<std::string> cEpgsearchServiceHandler::TimerConflictList(bool relOnly)
 {
     std::list<std::string> list;
     cConflictCheck conflictCheck;
+    conflictCheck.SetLocal(); // remote Timers would give a wrong Id
     conflictCheck.Check();
 
     if ((relOnly && conflictCheck.numConflicts > 0) ||