mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: afb6e0d4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-04 (Thu, 04 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-04 12:02:35 +02:00
parent 9a737d7526 875a08f014
commit 10fec22ab4
8 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/eventlist.cpp
View File

@@ -601,10 +601,13 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
}
else if (msg == CRCInput::RC_epg)
{
hide();
CEPGplusHandler eplus;
eplus.exec(NULL, "");
loop = false;
if (g_settings.eventlist_epgplus)
{
hide();
CEPGplusHandler eplus;
eplus.exec(NULL, "");
loop = false;
}
}
else if (msg==CRCInput::RC_help || msg==CRCInput::RC_ok || msg==CRCInput::RC_info)
{