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

This commit is contained in:
Jacek Jendrzej
2013-03-27 16:18:32 +01:00
committed by [CST] Focus
parent cecbd13107
commit 25653df890

View File

@@ -745,6 +745,15 @@ 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;
@@ -753,6 +762,7 @@ int CChannelList::show()
} }
} }
} }
}
if(found) { if(found) {
bouquetList->activateBouquet(nNext, false); bouquetList->activateBouquet(nNext, false);
res = bouquetList->showChannelList(); res = bouquetList->showChannelList();