mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 00:11:08 +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 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a62689a553
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-09 (Tue, 09 Aug 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-09 18:01:04 +02:00
parent 9a94bc9d92 7e296ed9d8
commit 8c85d81624
4 changed files with 8 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/epgview.cpp
View File

@@ -985,6 +985,12 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
switch ( msg )
{
case NeutrinoMessages::EVT_TIMER:
if (data == fader.GetFadeTimer()) {
if (fader.FadeDone())
loop = false;
}
else
CNeutrinoApp::getInstance()->handleMsg(msg, data);
if (!mp_info)
{
if (data == g_InfoViewer->getUpdateTimer()) {
@@ -997,12 +1003,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
pb.paint(false);
}
}
if (data == fader.GetFadeTimer()) {
if (fader.FadeDone())
loop = false;
}
else
CNeutrinoApp::getInstance()->handleMsg(msg, data);
}
break;
case NeutrinoMessages::EVT_CURRENTNEXT_EPG: