mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 08:51:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "src/gui/channellist.cpp: fix to 36e95d7fbc if more bouquets empty"

Browse Source 
This reverts commit f4ae5e17ce.

a better solution without duplicating code is available
This commit is contained in:
Stefan Seyfried
2013-04-06 13:33:29 +02:00
parent 6fa592323b
commit 8ba673497e
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/channellist.cpp
View File

@@ -749,15 +749,6 @@ int CChannelList::show()
if(bouquetList->Bouquets[nNext]->channelList->isEmpty() ) { if(bouquetList->Bouquets[nNext]->channelList->isEmpty() ) {
found = false; found = false;
nNext = (nNext + b_size + dir) % b_size; nNext = (nNext + b_size + dir) % b_size;
if(msg == (neutrino_msg_t)g_settings.key_bouquet_down){
for (int i = nNext; i > 0; i--) {
if( !bouquetList->Bouquets[i]->channelList->isEmpty() ) {
found = true;
nNext = i;
break;
}
}
}else{
for (int i = nNext; i < b_size; i++) { for (int i = nNext; i < b_size; i++) {
if( !bouquetList->Bouquets[i]->channelList->isEmpty() ) { if( !bouquetList->Bouquets[i]->channelList->isEmpty() ) {
found = true; found = true;
@@ -766,7 +757,6 @@ int CChannelList::show()
} }
} }
} }
}
if(found) { if(found) {
bouquetList->activateBouquet(nNext, false); bouquetList->activateBouquet(nNext, false);
res = bouquetList->showChannelList(); res = bouquetList->showChannelList();