From ae21d7d32eff88f3384887ebcd8341039681b223 Mon Sep 17 00:00:00 2001
From: Christian Wieninger <cwieninger (at) gmx (dot) de>
Date: Thu, 28 Feb 2008 22:47:08 +0100
Subject: removed throw in timer conflict check if epgsearch is too old

---
 timerconflict.cpp | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/timerconflict.cpp b/timerconflict.cpp
index 99005d4..01f473a 100644
--- a/timerconflict.cpp
+++ b/timerconflict.cpp
@@ -69,27 +69,31 @@ namespace vdrlive {
 	TimerConflicts::TimerConflicts()
 	{
 		Epgsearch_services_v1_1 service;
-		if ( !CheckEpgsearchVersion() || cPluginManager::CallFirstService(ServiceInterface, &service) == 0 )
-			throw HtmlError( tr("EPGSearch version outdated! Please update.") );
-		cServiceHandler_v1_1* handler = dynamic_cast<cServiceHandler_v1_1*>(service.handler.get());
-		if (handler) 
+		if ( CheckEpgsearchVersion() && cPluginManager::CallFirstService(ServiceInterface, &service))
 		  {
-		    list< string > conflicts = service.handler->TimerConflictList();
-		    m_conflicts.assign( conflicts.begin(), conflicts.end() );
-		    m_conflicts.sort();
+		    cServiceHandler_v1_1* handler = dynamic_cast<cServiceHandler_v1_1*>(service.handler.get());
+		    if (handler) 
+		      {
+			list< string > conflicts = service.handler->TimerConflictList();
+			m_conflicts.assign( conflicts.begin(), conflicts.end() );
+			m_conflicts.sort();
+		      }
 		  }
 	}
 
 	bool TimerConflicts::CheckAdvised()
 	{
 		Epgsearch_services_v1_1 service;
-		if ( !CheckEpgsearchVersion() || cPluginManager::CallFirstService(ServiceInterface, &service) == 0 )
-			throw HtmlError( tr("EPGSearch version outdated! Please update.") );
-		cServiceHandler_v1_1* handler = dynamic_cast<cServiceHandler_v1_1*>(service.handler.get());
-		if (!handler) 
+		if (CheckEpgsearchVersion() && cPluginManager::CallFirstService(ServiceInterface, &service))
+		  {
+		    cServiceHandler_v1_1* handler = dynamic_cast<cServiceHandler_v1_1*>(service.handler.get());
+		    if (!handler) 
+		      return false;
+		    else
+		      return handler->IsConflictCheckAdvised();
+		  }
+		else 
 		  return false;
-		else
-		  return handler->IsConflictCheckAdvised();
 	}
 
 	TimerConflictNotifier::TimerConflictNotifier()
-- 
cgit v1.2.3