From 2c554b1ae7ca93b59f9b1982021e487532d81943 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 27 Sep 2017 11:11:12 +0200 Subject: [PATCH] Revert "CMenuWidget: simplify menu_left_exit code, add missing break" This reverts commit 1582977133a9a6a33c6aee826669d912e784df97. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/1deaebf1cf3c14dfbe8382d3177c12729f368710 Author: Jacek Jendrzej Date: 2017-09-27 (Wed, 27 Sep 2017) ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 53c99dbff..eb34d4d74 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -928,12 +928,16 @@ 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; + { + if(hasItem() && selected > -1 && (int)items.size() > selected) { + CMenuItem* itemX = items[selected]; + if (!itemX->isMenueOptionChooser()) { + if (g_settings.menu_left_exit) + msg = CRCInput::RC_timeout; + break; + } + } } - break; case (CRCInput::RC_right): case (CRCInput::RC_ok): {