mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-28 16:01:10 +02:00
Merge remote-tracking branch 'check/cst-next'
*needs buildfixing*
Conflicts:
src/daemonc/Makefile.am
src/daemonc/remotecontrol.cpp
src/driver/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/pictureviewer/Makefile.am
src/driver/vfd.cpp
src/gui/bedit/Makefile.am
src/gui/components/Makefile.am
src/gui/luainstance.cpp
src/gui/widget/Makefile.am
src/nhttpd/tuxboxapi/coolstream/Makefile.am
src/system/Makefile.am
Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -1255,7 +1255,7 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6
|
||||
if (ev.type == EV_SYN)
|
||||
continue; /* ignore... */
|
||||
SHTDCNT::getInstance()->resetSleepTimer();
|
||||
if (firstKey) {
|
||||
if (ev.value && firstKey) {
|
||||
firstKey = false;
|
||||
CTimerManager::getInstance()->cancelShutdownOnWakeup();
|
||||
}
|
||||
|
Reference in New Issue
Block a user