X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/de2b88f0625eed72f30bd994ddc2624bd32397d8..654f9ddcbd850acbd23cb0b568632268cfd26f22:/lib/dvb/epgcache.cpp

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index fb121ae8..28718800 100644
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -1008,10 +1008,25 @@ RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, co
 	{
 		if (!t)
 			t = time(0)+eDVBLocalTimeHandler::getInstance()->difference();
-
-		timeMap::iterator i = It->second.second.lower_bound(t);
-		if ( i != It->second.second.end() && t <= i->first+i->second->getDuration() )
+		timeMap::iterator i = It->second.second.lower_bound(t);  // find > or equal
+		if ( i != It->second.second.end() )
 		{
+			if ( i->second->getStartTime() != t )
+			{
+				timeMap::iterator x = i;
+				--x;
+				if ( x != It->second.second.end() )
+				{
+					time_t start_time = x->second->getStartTime();
+					if (t < start_time)
+						return -1;
+					if (t > (start_time+x->second->getDuration()))
+						return -1;
+					i = x;
+				}
+				else
+					return -1;
+			}
 			result = i->second;
 			return 0;
 		}
@@ -1121,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