diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp index 0953d03b6..2ecabefbc 100644 --- a/src/gui/bedit/bouqueteditor_bouquets.cpp +++ b/src/gui/bedit/bouqueteditor_bouquets.cpp @@ -211,7 +211,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* bouquetsChanged = false; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(*timeout_ptr); bool loop = true; while (loop) @@ -219,7 +219,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd); if (msg <= CRCInput::RC_MaxRC) - timeoutEnd = CRCInput::calcTimeoutEnd(timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(*timeout_ptr); if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel)) { @@ -354,7 +354,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* paintFoot(); paintItems(); - timeoutEnd = CRCInput::calcTimeoutEnd(timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(*timeout_ptr); } } else if (state == beMoving) diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp index b398c5fb3..76a9b2022 100644 --- a/src/gui/bedit/bouqueteditor_channels.cpp +++ b/src/gui/bedit/bouqueteditor_channels.cpp @@ -251,7 +251,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* channelsChanged = false; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(*timeout_ptr); bool loop = true; while (loop) @@ -259,7 +259,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd); if (msg <= CRCInput::RC_MaxRC) - timeoutEnd = CRCInput::calcTimeoutEnd(timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(*timeout_ptr); if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel)) { @@ -296,7 +296,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* if (state == beDefault) addChannel(); - timeoutEnd = CRCInput::calcTimeoutEnd(timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(*timeout_ptr); } else if (msg == CRCInput::RC_yellow) { diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp index 66a11dc3e..8b98500cc 100644 --- a/src/gui/bedit/bouqueteditor_chanselect.cpp +++ b/src/gui/bedit/bouqueteditor_chanselect.cpp @@ -251,7 +251,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti paintFoot(); paintItems(); - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(*timeout_ptr); channelChanged = false; bool loop = true; @@ -260,7 +260,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd); if (msg <= CRCInput::RC_MaxRC) - timeoutEnd = CRCInput::calcTimeoutEnd(timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(*timeout_ptr); if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) || (msg == CRCInput::RC_home)) { diff --git a/src/gui/bedit/bouqueteditor_globals.cpp b/src/gui/bedit/bouqueteditor_globals.cpp index a09a8259f..445742c7c 100644 --- a/src/gui/bedit/bouqueteditor_globals.cpp +++ b/src/gui/bedit/bouqueteditor_globals.cpp @@ -53,7 +53,7 @@ CBEGlobals::CBEGlobals() x = getScreenStartX(width); y = getScreenStartY(height); - timeout = g_settings.timing[SNeutrinoSettings::TIMING_MENU]; + timeout_ptr = &g_settings.timing[SNeutrinoSettings::TIMING_MENU]; dline = NULL; ibox = NULL; diff --git a/src/gui/bedit/bouqueteditor_globals.h b/src/gui/bedit/bouqueteditor_globals.h index bd071ba45..299e42ed1 100644 --- a/src/gui/bedit/bouqueteditor_globals.h +++ b/src/gui/bedit/bouqueteditor_globals.h @@ -54,7 +54,7 @@ class CBEGlobals int status_icon_width; unsigned int items_count; - int timeout; + int* timeout_ptr; void paintBody();