From ad153ed851b37992ffe928866ad6b4f589f375af Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Tue, 2 Jun 2015 15:41:51 +0300
Subject: [PATCH] gui/eventlist.cpp: use epg id to get events

---
 src/gui/eventlist.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp
index a66477faf..776f14bfa 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -250,6 +250,11 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
 	neutrino_msg_data_t data;
 	bool in_search = false;
 	showfollow = false;
+	t_channel_id epg_id = channel_id;
+
+	CZapitChannel * ch = CServiceManager::getInstance()->FindChannel(channel_id);
+	if (ch)
+		epg_id = ch->getEpgID();
 
 	full_width = frameBuffer->getScreenWidthRel();
 	x = getScreenStartX(full_width);
@@ -314,7 +319,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
 		copy(followlist.begin(), followlist.end(), ii);
 		showfollow = true;
 	}else{
-		readEvents(channel_id);
+		readEvents(epg_id);
 	}
 	UpdateTimerList();
 
@@ -542,7 +547,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
 				in_search = false;
 				m_showChannel = false;
 				paintHead(channel_id, channelname);
-				readEvents(channel_id);
+				readEvents(epg_id);
 				paint(channel_id);
 				showFunctionBar(true, channel_id);
 			} else {