From 17a83c456b51278f0340069e77a32f592644cfec Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Thu, 22 Dec 2011 15:51:46 +0000
Subject: [PATCH] Move left/right handling after user-defined keys

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1987 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/83e0e1bc986e2f5bb4412794516511422c1bcd93
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-12-22 (Thu, 22 Dec 2011)
---
 src/gui/bouquetlist.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp
index 1feb279fe..d3e77038a 100644
--- a/src/gui/bouquetlist.cpp
+++ b/src/gui/bouquetlist.cpp
@@ -376,20 +376,6 @@ int CBouquetList::show(bool bShowChannelList)
 				return -3;
 			}
 		}
-		else if(msg == CRCInput::RC_left || msg == CRCInput::RC_right) {
-			if(bShowChannelList) {
-				int mode = CNeutrinoApp::getInstance()->GetChannelMode();
-				mode += (msg == CRCInput::RC_left) ? -1 : 1;
-				if(mode < 0)
-					mode = LIST_MODE_LAST - 1;
-				else if(mode >= LIST_MODE_LAST)
-					mode = 0;
-				CNeutrinoApp::getInstance()->SetChannelMode(mode);
-				hide();
-				return -3;
-			}
-
-		}
 		else if(Bouquets.size() == 0)
 			continue; //FIXME msgs not forwarded to neutrino !!
 		else if ( msg == CRCInput::RC_setup) {
@@ -469,6 +455,20 @@ int CBouquetList::show(bool bShowChannelList)
 			else
 				paintItem(selected - liststart);
 		}
+		else if(msg == CRCInput::RC_left || msg == CRCInput::RC_right) {
+			if(bShowChannelList) {
+				int mode = CNeutrinoApp::getInstance()->GetChannelMode();
+				mode += (msg == CRCInput::RC_left) ? -1 : 1;
+				if(mode < 0)
+					mode = LIST_MODE_LAST - 1;
+				else if(mode >= LIST_MODE_LAST)
+					mode = 0;
+				CNeutrinoApp::getInstance()->SetChannelMode(mode);
+				hide();
+				return -3;
+			}
+
+		}
 
 		else if ( msg == CRCInput::RC_ok ) {
 			if(!bShowChannelList || Bouquets[selected]->channelList->getSize() > 0) {