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

Merge branch 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Commit: 4fc73acffc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-29 (Fri, 29 Sep 2017)
This commit is contained in:
Jacek Jendrzej
2017-09-29 10:49:27 +02:00
parent 2417d86939 20451a9be6
commit 384b18ad8e
27 changed files with 89 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/dboxinfo.cpp
View File

@@ -103,8 +103,7 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &)
bool doLoop = true;
int timeout = g_settings.timing[SNeutrinoSettings::TIMING_MENU];
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd( timeout == 0 ? 0xFFFF : timeout);
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
uint32_t updateTimer = g_RCInput->addTimer(5*1000*1000, false);
while (doLoop)
@@ -122,7 +121,7 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &)
( msg == CRCInput::RC_home ) ||
( msg == CRCInput::RC_ok ) ) {
if(fader.StartFadeOut()) {
timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
timeoutEnd = CRCInput::calcTimeoutEnd(1);
msg = 0;
} else
doLoop = false;
@@ -150,7 +149,7 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &)
if ((msg <= CRCInput::RC_MaxRC) &&
(data == 0)) /* <- button pressed */
{
timeoutEnd = CRCInput::calcTimeoutEnd( timeout );
timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
}
}
}