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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/gui/bookmarkmanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 537ea51fcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-29 08:35:05 +02:00
parent d6bf987c5e 369436124b
commit c75a12894f
28 changed files with 93 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/lua/lua_hintbox.cpp
View File

@@ -138,7 +138,7 @@ int CLuaInstHintbox::HintboxExec(lua_State *L)
timeout = 5; /// default timeout 5 sec
//timeout = g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR];
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd( timeout );
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
int res = messages_return::none;