From 821d8204a00c544ff56a7ac80da22bb0d1e5c81d Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Mon, 12 Dec 2005 20:12:20 +0000 Subject: [PATCH] fix --- lib/dvb/epgcache.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp index b2157693..28718800 100644 --- a/lib/dvb/epgcache.cpp +++ b/lib/dvb/epgcache.cpp @@ -1136,12 +1136,19 @@ RESULT eEPGCache::startTimeQuery(const eServiceReference &service, time_t begin, if ( begin != -1 ) { m_timemap_cursor = It->second.second.lower_bound(begin); - if ( m_timemap_cursor != It->second.second.end() && m_timemap_cursor != It->second.second.begin() ) + if ( m_timemap_cursor != It->second.second.end() ) { - timeMap::iterator it = m_timemap_cursor; - --it; - if ( (it->second->getStartTime() + it->second->getDuration()) > begin ) - m_timemap_cursor = it; + if ( m_timemap_cursor->second->getStartTime() != begin ) + { + timeMap::iterator x = m_timemap_cursor; + --x; + if ( x != It->second.second.end() ) + { + time_t start_time = x->second->getStartTime(); + if ( begin > start_time && begin < (start_time+x->second->getDuration())) + m_timemap_cursor = x; + } + } } } else -- 2.30.2