diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 2da390770..54c9bd374 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -1053,18 +1053,6 @@ void CEpgData::GetPrevNextEPGData( uint64_t id, time_t* startzeit ) break; } } - /* Houdini: dirty RTL double event workaround, if prev/next event has same starttime as actual event skip it */ - if ((prev_zeit == *startzeit) && ((i-1) > 0)) - { - prev_id = evtlist[i- 2].eventID; - prev_zeit = evtlist[i- 2].startTime; - } - if ((next_zeit == *startzeit) && ((i+1) < (evtlist.size()- 1))) - { - next_id = evtlist[i+ 2].eventID; - next_zeit = evtlist[i+ 2].startTime; - } - } // diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 521c9a968..981e04fbe 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -171,18 +171,9 @@ void EventList::readEvents(const t_channel_id channel_id) } // Houdini added for Private Premiere EPG, start sorted by start date/time sort(evtlist.begin(),evtlist.end(),sortByDateTime); - // Houdini: dirty workaround for RTL double events, remove them - CChannelEventList::iterator e2; - for ( e=evtlist.begin(); e!=evtlist.end(); ++e ) - { - e2 = e+1; - if ( e2!=evtlist.end() && (e->startTime == e2->startTime)) { - evtlist.erase(e2); - } - } + timerlist.clear(); g_Timerd->getTimerList (timerlist); - } current_event = (unsigned int)-1;