Merge branch 'master' into pu/msgbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: 96ffa4778a
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
2016-11-11 00:51:20 +01:00
3 changed files with 10 additions and 8 deletions

View File

@@ -991,6 +991,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
case CRCInput::RC_left:
if ((prev_id != 0) && !call_fromfollowlist && !mp_info)
{
toph = topboxheight;
show(channel_id, prev_id, &prev_zeit, false);
showPos=0;
}
@@ -998,6 +999,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
case CRCInput::RC_right:
if ((next_id != 0) && !call_fromfollowlist && !mp_info)
{
toph = topboxheight;
show(channel_id, next_id, &next_zeit, false);
showPos=0;
}