Merge branch 'cst-next' into nmp-cst-next

Origin commit data
------------------
Commit: db8a9e6388
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)
This commit is contained in:
Michael Liebmann
2016-01-25 13:20:10 +01:00
13 changed files with 38 additions and 19 deletions

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;