changed conflict check advise handling

2 files changed, 4 insertions, 1 deletions

diff --git a/conflictcheck.c b/conflictcheck.c
index cf12b41..129e19b 100644
--- a/conflictcheck.c
+++ b/conflictcheck.c
@@ -216,7 +216,6 @@ void cConflictCheck::Check()
 		LogFile.Log(2,"timer '%s' (%s, channel %s) failed", (*it)->timer->File(), DAYDATETIME((*it)->timer->StartTime()), CHANNELNAME((*it)->timer->Channel()));
 	}
     }
-    if (gl_timerStatusMonitor) gl_timerStatusMonitor->SetConflictCheckAdvised(false);
 }
 
 cList<cConflictCheckTimerObj>* cConflictCheck::CreateCurrentTimerList()
diff --git a/services.c b/services.c
index c9c5f00..569a4b0 100644
--- a/services.c
+++ b/services.c
@@ -311,6 +311,10 @@ std::list<std::string> cEpgsearchServiceHandler::TimerConflictList(bool relOnly)
 	   list.push_back(conflline.str());
 	 }
      }
+   
+   // set advised to false after an external conflict check
+   if (gl_timerStatusMonitor) gl_timerStatusMonitor->SetConflictCheckAdvised(false);
+
    return list;    
 }