diff --git a/src/gui/moviebrowser/mb.h b/src/gui/moviebrowser/mb.h index d51cca4a2..6f0a9fbe1 100644 --- a/src/gui/moviebrowser/mb.h +++ b/src/gui/moviebrowser/mb.h @@ -409,7 +409,7 @@ class CMenuWidgetSelection : public CMenuWidget { public: CMenuWidgetSelection(const neutrino_locale_t Name, const std::string & Icon = "", const int mwidth = 30) : CMenuWidget(Name, Icon, mwidth){;}; - int getSelectedLine(void){return exit_pressed ? -1 : selected;}; + int getSelectedLine(void){return no_action ? -1 : selected;}; }; class CFileChooser : public CMenuWidget diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index c083dd684..3aa29b1c8 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -769,7 +769,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) bool bAllowRepeatLR = false; CVFD::MODES oldLcdMode = CVFD::getInstance()->getMode(); - exit_pressed = false; + no_action = false; frameBuffer->Lock(); @@ -990,14 +990,16 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) break; case (CRCInput::RC_home): - exit_pressed = true; + no_action = true; msg = CRCInput::RC_timeout; break; case (CRCInput::RC_timeout): + no_action = true; break; case (CRCInput::RC_setup): //close any menu on menu-key { + no_action = true; msg = CRCInput::RC_timeout; retval = menu_return::RETURN_EXIT_ALL; } diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index 527b2a6f2..1c23c2dea 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -585,7 +585,7 @@ class CMenuWidget : public CMenuTarget, public CComponentsSignals unsigned int item_start_y; unsigned int current_page; unsigned int total_pages; - bool exit_pressed; + bool no_action; int from_wizard; bool fade; bool washidden; @@ -637,7 +637,7 @@ class CMenuWidget : public CMenuTarget, public CComponentsSignals void initSelectable(); int getSelected()const { return selected; }; void move(int xoff, int yoff); - int getSelectedLine(void)const {return exit_pressed ? -1 : selected;}; + int getSelectedLine(void)const {return no_action ? -1 : selected;}; void setWizardMode(int _from_wizard) { from_wizard = _from_wizard;}; void enableFade(bool _enable) { fade = _enable; }; void enableSaveScreen(bool enable);