Merge remote-tracking branch 'n/cst-next-fixed'

This commit is contained in:
Stefan Seyfried
2016-01-24 13:15:43 +01:00
58 changed files with 627 additions and 171 deletions

View File

@@ -404,8 +404,18 @@ void CVFD::showTime(bool force)
recstatus = tmp_recstatus;
}
void CVFD::showRCLock(int /*duration*/)
void CVFD::showRCLock(int duration)
{
if (!has_lcd)
{
sleep(duration);
return;
}
std::string _text = text;
ShowText(g_Locale->getText(LOCALE_RCLOCK_LOCKED));
sleep(duration);
ShowText(_text.c_str());
}
void CVFD::showVolume(const char vol, const bool force_update)