mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-03 02:41:12 +02:00
menu: fix return value of getSelectedLine() for RC_timeout and RC_setup
This fixes the bahaviour of StartPosSelectionMenu in moviebrowser.
When this menu was closed by its timeout or RC_setup was pressed
the movie starts anyway.
Origin commit data
------------------
Commit: 70cbc65483
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-15 (Sun, 15 Jul 2018)
Origin message was:
------------------
- menu: fix return value of getSelectedLine() for RC_timeout and RC_setup
This fixes the bahaviour of StartPosSelectionMenu in moviebrowser.
When this menu was closed by its timeout or RC_setup was pressed
the movie starts anyway.
This commit is contained in:
@@ -790,7 +790,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();
|
||||
|
||||
@@ -1019,14 +1019,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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user