From 9f3ba8341f9f792d6c093489a1062b1c5e63884c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 30 Sep 2017 08:10:56 +0200 Subject: [PATCH] Revert "Revert "CMenuWidget: simplify menu_left_exit code, add missing break"" This reverts the revert commit 2c554b1ae7ca93b59f9b1982021e487532d81943. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/39d31166c978e932e1dc2a36db08b0b2f3ae32f1 Author: vanhofen Date: 2017-09-30 (Sat, 30 Sep 2017) ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index a6feeac7a..aa25bac16 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -949,16 +949,12 @@ 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()) { - if (g_settings.menu_left_exit) - msg = CRCInput::RC_timeout; - break; - } - } + 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): {