From 93dc924c1dfbd25a5bd5962d1d54fc6d5401b898 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Fri, 18 Jun 2010 03:28:54 +0000 Subject: [PATCH] correct next event info on pressed info button in channellist (copy/paste from tuxbox cvs ;) ) git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@628 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8f8625b9f3729c6171d021c14fe332db8456147d Author: Jacek Jendrzej Date: 2010-06-18 (Fri, 18 Jun 2010) Origin message was: ------------------ -correct next event info on pressed info button in channellist (copy/paste from tuxbox cvs ;) ) git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@628 e54a6e83-5905-42d5-8d5c-058d10e6a962 ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 01c3668ee..7c0fb9461 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -762,7 +762,20 @@ int CChannelList::show() } else if ((msg == CRCInput::RC_info) || (msg == CRCInput::RC_help)) { hide(); - g_EpgData->show(chanlist[selected]->channel_id); + CChannelEvent *p_event=NULL; + if (displayNext) + { + p_event = &(chanlist[selected]->nextEvent); + } + + if(p_event && p_event->eventID) + { + g_EpgData->show(chanlist[selected]->channel_id,p_event->eventID,&(p_event->startTime)); + } + else + { + g_EpgData->show(chanlist[selected]->channel_id); + } paintHead(); paint(); } else {