mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source 
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
parent 3d2186eafe 6a9ccee0bf
commit fa8fc40b60
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/bedit/bouqueteditor_bouquets.cpp
View File

@@ -362,6 +362,8 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
paintBody(); paintBody();
paintFoot(); paintFoot();
paintItems(); paintItems();
timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
} }
} }
else if (state == beMoving) else if (state == beMoving)

2
src/gui/bedit/bouqueteditor_channels.cpp
View File

@@ -356,6 +356,8 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
{ {
if (state == beDefault) if (state == beDefault)
addChannel(); addChannel();
timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
} }
else if (msg == CRCInput::RC_yellow) else if (msg == CRCInput::RC_yellow)
{ {

2
src/gui/bedit/bouqueteditor_chanselect.cpp
View File

@@ -326,7 +326,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti
if (msg <= CRCInput::RC_MaxRC) if (msg <= CRCInput::RC_MaxRC)
timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
if ((msg == (neutrino_msg_t)g_settings.key_channelList_cancel) || (msg == CRCInput::RC_home)) if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) || (msg == CRCInput::RC_home))
{ {
loop = false; loop = false;
} }

14
src/gui/widget/menue.cpp
View File

@@ -927,12 +927,16 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
break; break;
} }
case (CRCInput::RC_left): case (CRCInput::RC_left):
if (hasItem() && selected > -1 && (int)items.size() > selected) { {
CMenuItem* itemX = items[selected]; if(hasItem() && selected > -1 && (int)items.size() > selected) {
if (!itemX->isMenueOptionChooser() && g_settings.menu_left_exit) CMenuItem* itemX = items[selected];
msg = CRCInput::RC_timeout; if (!itemX->isMenueOptionChooser()) {
if (g_settings.menu_left_exit)
msg = CRCInput::RC_timeout;
break;
}
}
} }
break;
case (CRCInput::RC_right): case (CRCInput::RC_right):
case (CRCInput::RC_ok): case (CRCInput::RC_ok):
{ {