summaryrefslogtreecommitdiff
path: root/timerconflict.cpp
diff options
context:
space:
mode:
authorChristian Wieninger <cwieninger (at) gmx (dot) de>2008-02-28 21:47:08 (GMT)
committerChristian Wieninger <cwieninger (at) gmx (dot) de>2008-02-28 21:47:08 (GMT)
commitae21d7d32eff88f3384887ebcd8341039681b223 (patch)
treec9dbeab5a1bf931213043e4a86721f27329005f3 /timerconflict.cpp
parent01d8689f9260fb063de7712681b243fb48ef513a (diff)
downloadvdr-plugin-live-ae21d7d32eff88f3384887ebcd8341039681b223.tar.gz
vdr-plugin-live-ae21d7d32eff88f3384887ebcd8341039681b223.tar.bz2
removed throw in timer conflict check if epgsearch is too old
Diffstat (limited to 'timerconflict.cpp')
-rw-r--r--timerconflict.cpp30
1 files 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()