mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 19:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)
This commit is contained in:
vanhofen
2017-08-23 15:24:38 +02:00
parent 1e4ded8ce9 142d17c8b0
commit 5628badb78
15 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/eventlist.cpp
View File

@@ -265,7 +265,6 @@ void CEventList::readEvents(const t_channel_id channel_id)
void CEventList::getChannelNames(t_channel_id &channel_id, std::string &current_channel_name, std::string &prev_channel_name, std::string &next_channel_name, neutrino_msg_t msg)
{
t_bouquet_id current_bouquet_id = bouquetList->getActiveBouquetNumber();
t_channel_id channel_id_tmp = channel_id;
const unsigned int channel_nr = bouquetList->Bouquets[current_bouquet_id]->channelList->getSize();
if(channel_nr < 2){
channel_id = 0;
@@ -274,7 +273,7 @@ void CEventList::getChannelNames(t_channel_id &channel_id, std::string &current_
unsigned int tmp_channel = 0;
for(unsigned int channel = 0; channel < channel_nr; channel++)
{
channel_id_tmp = bouquetList->Bouquets[current_bouquet_id]->channelList->getChannelFromIndex(channel)->getChannelID();
t_channel_id channel_id_tmp = bouquetList->Bouquets[current_bouquet_id]->channelList->getChannelFromIndex(channel)->getChannelID();
if(channel_id_tmp == channel_id){
if ( msg==CRCInput::RC_right || msg==CRCInput::RC_forward ) {
channel = (channel+1) %channel_nr;