From ee8a577fef0e7e7f5d2ac7cc51550df9bddbf4e5 Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Fri, 29 Sep 2017 20:37:37 +0200
Subject: [PATCH] CMenuWidget: fix "left" key for menuchoosers where

the "decrement menu function" got lost by the last "simplify code and
add missing break" commit. The implicit fallthrough actually was used to
execute the "left" function.
Reorganize the code so that it works even without the implicit
fallthrough.


Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/fea586b31116e0c1630e2232e30e2ad9269f2e5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)



------------------
This commit was generated by Migit
---
 src/gui/widget/menue.cpp | 77 +++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 40 deletions(-)

diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index aa25bac16..31711bea6 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -949,50 +949,47 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 				break;
 			}
 			case (CRCInput::RC_left):
-				if (hasItem() && selected > -1 && (int)items.size() > selected) {
-					CMenuItem* itemX = items[selected];
-					if (!itemX->isMenueOptionChooser() && g_settings.menu_left_exit)
-						msg = CRCInput::RC_timeout;
-				}
-				break;
 			case (CRCInput::RC_right):
 			case (CRCInput::RC_ok):
-				{
-					if(hasItem() && selected > -1 && (int)items.size() > selected) {
-						//NI lcd4l-support
-						LCD4l->RemoveFile("/tmp/lcd/menu");
+				if (hasItem() && selected > -1 && (int)items.size() > selected) {
+					//NI lcd4l-support
+					LCD4l->RemoveFile("/tmp/lcd/menu");
 
-						//exec this item...
-						CMenuItem* item = items[selected];
-						if (!item->isSelectable())
-							break;
-						item->msg = msg;
-						fader.StopFade();
-						int rv = item->exec( this );
-
-						//NI lcd4l-support
-						if (g_settings.lcd4l_support)
-							LCD4l->CreateFile("/tmp/lcd/menu", item->lcd4l_text, g_settings.lcd4l_convert);
-
-						switch ( rv ) {
-							case menu_return::RETURN_EXIT_ALL:
-								retval = menu_return::RETURN_EXIT_ALL;
-								/* fall through */
-							case menu_return::RETURN_EXIT:
-								msg = CRCInput::RC_timeout;
-								break;
-							case menu_return::RETURN_REPAINT:
-							case menu_return::RETURN_EXIT_REPAINT:
-								if (fade && washidden)
-									fader.StartFadeIn();
-								checkHints();
-								pos = selected;
-								paint();
-								break;
-						}
-					} else
+					//exec this item...
+					CMenuItem* item = items[selected];
+					if (msg == CRCInput::RC_left && g_settings.menu_left_exit &&
+						!item->isMenueOptionChooser()) {
 						msg = CRCInput::RC_timeout;
-				}
+						break;
+					}
+					if (!item->isSelectable())
+						break;
+					item->msg = msg;
+					fader.StopFade();
+					int rv = item->exec( this );
+
+					//NI lcd4l-support
+					if (g_settings.lcd4l_support)
+						LCD4l->CreateFile("/tmp/lcd/menu", item->lcd4l_text, g_settings.lcd4l_convert);
+
+					switch ( rv ) {
+						case menu_return::RETURN_EXIT_ALL:
+							retval = menu_return::RETURN_EXIT_ALL;
+							/* fall through */
+						case menu_return::RETURN_EXIT:
+							msg = CRCInput::RC_timeout;
+							break;
+						case menu_return::RETURN_REPAINT:
+						case menu_return::RETURN_EXIT_REPAINT:
+							if (fade && washidden)
+								fader.StartFadeIn();
+							checkHints();
+							pos = selected;
+							paint();
+							break;
+					}
+				} else
+					msg = CRCInput::RC_timeout;
 				break;
 
 			case (CRCInput::RC_home):