From 32075530f5f13c71cfc7cbfcf7b8d65211a2ad4f Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 6 Apr 2013 13:33:29 +0200 Subject: [PATCH] Revert "src/gui/channellist.cpp: fix to eb9cc7950dfa966d2df4bd2206ba8bafcc79ec02 if more bouquets empty" This reverts commit b212f46c3d3cde5957e0f6047f23d1793e0b5082. a better solution without duplicating code is available Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/8ba673497edc8932708dec9140daba022895576d Author: Stefan Seyfried Date: 2013-04-06 (Sat, 06 Apr 2013) --- src/gui/channellist.cpp | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 4b5c46624..1137fa7b3 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -749,21 +749,11 @@ int CChannelList::show() if(bouquetList->Bouquets[nNext]->channelList->isEmpty() ) { found = false; 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++) { - if( !bouquetList->Bouquets[i]->channelList->isEmpty() ) { - found = true; - nNext = i; - break; - } + for (int i = nNext; i < b_size; i++) { + if( !bouquetList->Bouquets[i]->channelList->isEmpty() ) { + found = true; + nNext = i; + break; } } }