From 125eb9aa40f2b552e816f4ebff67d2e77449e770 Mon Sep 17 00:00:00 2001 From: Karl Melscher Date: Wed, 7 Mar 2018 15:47:54 +0100 Subject: Changes for VDR 2.3.x --- lcarsng.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'lcarsng.c') diff --git a/lcarsng.c b/lcarsng.c index a171686..c72e3d9 100644 --- a/lcarsng.c +++ b/lcarsng.c @@ -1803,15 +1803,20 @@ void cLCARSNGDisplayMenu::SetTitle(const char *Title) osd->DrawRectangle(xs12, ys00, xs13 - 1, ys01 - 1, frameColor); int NumTimers = 0; #if APIVERSNUM > 20300 - LOCK_TIMERS_READ; - for (const cTimer *Timer = Timers->First(); Timer; Timer = Timers->Next(Timer)) { + if (const cTimers *Timers = cTimers::GetTimersRead(timersStateKey)) { + for (const cTimer *Timer = Timers->First(); Timer; Timer = Timers->Next(Timer)) { #else - for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) { + if (Timers.Modified(lastTimersState)) { + for (cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) { +#endif + if (Timer->HasFlags(tfActive)) + NumTimers++; + } + osd->DrawText(xs00, ys00, itoa(NumTimers), Theme.Color(clrMenuFrameFg), frameColor, font, xs03 - xs02, ys01 - ys00, taBottom | taLeft | taBorder); +#if APIVERSNUM > 20300 + timersStateKey.Remove(); #endif - if (Timer->HasFlags(tfActive)) - NumTimers++; } - osd->DrawText(xs00, ys00, itoa(NumTimers), Theme.Color(clrMenuFrameFg), frameColor, font, xs03 - xs02, ys01 - ys00, taBottom | taLeft | taBorder); } break; default: -- cgit v1.2.3