From 540bcfd77ea662eee554aeae27b9621c854659db Mon Sep 17 00:00:00 2001 From: Adrien Maglo Date: Tue, 15 Jun 2010 22:34:57 +0200 Subject: [PATCH] Qt: test if EPG events are the same by also comparing the start time. --- modules/gui/qt4/components/epg/EPGWidget.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/gui/qt4/components/epg/EPGWidget.cpp b/modules/gui/qt4/components/epg/EPGWidget.cpp index d62114aa7d..59b52290ee 100644 --- a/modules/gui/qt4/components/epg/EPGWidget.cpp +++ b/modules/gui/qt4/components/epg/EPGWidget.cpp @@ -83,19 +83,22 @@ void EPGWidget::updateEPG( vlc_epg_t **pp_epg, int i_epg ) EPGEvent *item = NULL; vlc_epg_event_t *p_event = p_epg->pp_event[j]; QString eventName = qfu( p_event->psz_name ); + QDateTime eventStart = QDateTime::fromTime_t( p_event->i_start ); QList events = m_events.values( channelName ); for ( int k = 0; k < events.count(); ++k ) { if ( events.at( k )->name == eventName && - events.at( k )->channelName == channelName ) + events.at( k )->channelName == channelName && + events.at( k )->start == eventStart ) { + /* Update the event. */ item = events.at( k ); item->updated = true; item->description = qfu( p_event->psz_description ); item->shortDescription = qfu( p_event->psz_short_description ); - item->start = QDateTime::fromTime_t( p_event->i_start ); + item->start = eventStart; item->duration = p_event->i_duration; item->current = ( p_epg->p_current == p_event ) ? true : false; @@ -112,7 +115,7 @@ void EPGWidget::updateEPG( vlc_epg_t **pp_epg, int i_epg ) item = new EPGEvent( eventName ); item->description = qfu( p_event->psz_description ); item->shortDescription = qfu( p_event->psz_short_description ); - item->start = QDateTime::fromTime_t( p_event->i_start ); + item->start = eventStart; item->duration = p_event->i_duration; item->channelName = channelName; item->current = ( p_epg->p_current == p_event ) ? true : false; -- 2.11.4.GIT