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

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