- bouqueteditor: fix timeout; editor doesn't open when timeout was "off"

This commit is contained in:
svenhoefer
2017-09-27 08:33:15 +02:00
committed by Jacek Jendrzej
parent db5af2d9ca
commit db80514499
5 changed files with 10 additions and 6 deletions

View File

@@ -315,7 +315,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti
paintFoot();
paintItems();
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
channelChanged = false;
bool loop = true;
@@ -324,7 +324,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti
g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
if (msg <= CRCInput::RC_MaxRC)
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
if ((msg == (neutrino_msg_t)g_settings.key_channelList_cancel) || (msg == CRCInput::RC_home))
{