diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index d643bca1b..a2641d25d 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -2126,12 +2126,15 @@ void CChannelList::paint_events(int index)
 			do
 			{
 				//printf("%d seconds in the past - deleted %s\n", dif, e->description.c_str());
-				if(!evtlist.empty())
-					e = evtlist.erase(e);
+				e = evtlist.erase( e );
+				if (e == evtlist.end())
+					break;
 				dif = azeit - e->startTime;
 			}
-			while (!evtlist.empty() && dif > 0 );
+			while ( dif > 0 );
 		}
+		if (e == evtlist.end()) 
+			break;
 		//Display the remaining events
 		struct tm *tmStartZeit = localtime(&e->startTime);
 		strftime(text1, sizeof(text1), "%H:%M", tmStartZeit );