mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 08:51:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-09-29 10:49:27 +02:00
parent 452f155f04 99cc7f850a
commit 4fc73acffc
27 changed files with 89 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/bookmarkmanager.cpp
View File

@@ -252,7 +252,7 @@ const CBookmark * CBookmarkManager::getBookmark(CMenuTarget* parent)
int res = -1;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
neutrino_msg_t msg;
neutrino_msg_data_t data;
@@ -269,7 +269,7 @@ const CBookmark * CBookmarkManager::getBookmark(CMenuTarget* parent)
g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd );
if ( msg <= CRCInput::RC_MaxRC )
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
if ( ( msg == CRCInput::RC_timeout ) ||
( msg == CRCInput::RC_home) )