From 6a9ccee0bf6e82866bc07377b3f5afa32bbdfa15 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 27 Sep 2017 11:50:47 +0200 Subject: [PATCH] bouqueteditor: some more timeout-fixes Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c00013ea526b51eaeea38a99f810a9160d321e33 Author: vanhofen Date: 2017-09-27 (Wed, 27 Sep 2017) Origin message was: ------------------ - bouqueteditor: some more timeout-fixes ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/bedit/bouqueteditor_bouquets.cpp | 2 ++ src/gui/bedit/bouqueteditor_channels.cpp | 2 ++ src/gui/bedit/bouqueteditor_chanselect.cpp | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp index 90ce43767..15a0d7e61 100644 --- a/src/gui/bedit/bouqueteditor_bouquets.cpp +++ b/src/gui/bedit/bouqueteditor_bouquets.cpp @@ -362,6 +362,8 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* paintBody(); paintFoot(); paintItems(); + + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } } else if (state == beMoving) diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp index 5bb25a86f..8b445b2c0 100644 --- a/src/gui/bedit/bouqueteditor_channels.cpp +++ b/src/gui/bedit/bouqueteditor_channels.cpp @@ -356,6 +356,8 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* { if (state == beDefault) addChannel(); + + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } else if (msg == CRCInput::RC_yellow) { diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp index 11bba6fb6..2dc5018cb 100644 --- a/src/gui/bedit/bouqueteditor_chanselect.cpp +++ b/src/gui/bedit/bouqueteditor_chanselect.cpp @@ -326,7 +326,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti if (msg <= CRCInput::RC_MaxRC) 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; }