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

Merge remote-tracking branch 'tuxbox/master'

Browse Source 
* needs compile fixes
* needs additional tests, of course :-)
This commit is contained in:
Stefan Seyfried
2016-10-22 11:37:40 +02:00
parent 4cb5245546 9a9fc2097b
commit 13ab1ebc8a
346 changed files with 13372 additions and 6088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/vfd.cpp
View File

@@ -406,7 +406,7 @@ void CVFD::showTime(bool force)
void CVFD::showRCLock(int duration)
{
if (!has_lcd)
if (!has_lcd || !g_settings.lcd_notify_rclock)
{
sleep(duration);
return;