Merge branch 'master' into pu/mp

Origin commit data
------------------
Branch: ni/coolstream
Commit: 1fc8437a34
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-09-27 11:56:03 +02:00
4 changed files with 14 additions and 6 deletions

View File

@@ -927,12 +927,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):
{