Revert "src/gui/channellist.cpp: fix to 06ac21d495 if more bouquets empty"

This reverts commit c4b67751af.

a better solution without duplicating code is available


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8ba673497e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-04-06 13:33:29 +02:00
parent 293b756560
commit 1589230f2e

View File

@@ -749,21 +749,11 @@ 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 < b_size; i++) {
for (int i = nNext; i > 0; i--) { if( !bouquetList->Bouquets[i]->channelList->isEmpty() ) {
if( !bouquetList->Bouquets[i]->channelList->isEmpty() ) { found = true;
found = true; nNext = i;
nNext = i; break;
break;
}
}
}else{
for (int i = nNext; i < b_size; i++) {
if( !bouquetList->Bouquets[i]->channelList->isEmpty() ) {
found = true;
nNext = i;
break;
}
} }
} }
} }