gui/components/cc_frm_clock: simplify; setClockFormat/setClockBlink has now impact on running thread

Conflicts:
	src/gui/components/cc_frm_clock.cpp
	src/gui/timeosd.cpp
This commit is contained in:
martii
2014-01-10 20:02:16 +01:00
committed by [CST] Focus
parent 9472155b88
commit 13118c1148
3 changed files with 12 additions and 19 deletions

View File

@@ -87,11 +87,11 @@ void CTimeOSD::initTimeString()
struct tm t;
if (m_mode == MODE_DESC) {
char tt[20];
strftime(tt, sizeof(tt), cl_format_str.c_str(), gmtime_r(&m_time_show, &t));
strftime(tt, sizeof(tt), cl_format_str, gmtime_r(&m_time_show, &t));
snprintf(cl_timestr, sizeof(cl_timestr), "-%s", tt);
}
else
strftime(cl_timestr, sizeof(cl_timestr), cl_format_str.c_str(), gmtime_r(&m_time_show, &t));
strftime(cl_timestr, sizeof(cl_timestr), cl_format_str, gmtime_r(&m_time_show, &t));
}
void CTimeOSD::show(time_t time_show, bool force)