From c316018bd45f32377f723dd27470a88bee28a3fc Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 23 Jun 2020 00:23:30 +0200 Subject: [PATCH] glcd: fix event start/end/duration Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/090a6857b5e347de177581c079a127ae046f75da Author: vanhofen Date: 2020-06-23 (Tue, 23 Jun 2020) Origin message was: ------------------ - glcd: fix event start/end/duration ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/glcd/glcd.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/driver/glcd/glcd.cpp b/src/driver/glcd/glcd.cpp index d9a13c631..f1198cc33 100644 --- a/src/driver/glcd/glcd.cpp +++ b/src/driver/glcd/glcd.cpp @@ -398,7 +398,6 @@ void cGLCD::Exec() if (percent_duration && t.glcd_show_duration) { - Lock(); Duration = stagingDuration; DurationWidth = font_duration.Width(Duration); @@ -411,7 +410,6 @@ void cGLCD::Exec() if (percent_start && t.glcd_show_start) { - Lock(); Start = stagingStart; StartWidth = font_start.Width(Start); @@ -1065,7 +1063,7 @@ void cGLCD::Run(void) todo = info_CurrentNext.current_zeit.dauer / 60; } snprintf(tmp_duration, sizeof(tmp_duration), "%d/%d", done, total); - Duration = tmp_duration; + Duration = stagingDuration = tmp_duration; } if (Scale > 100) Scale = 100; @@ -1074,7 +1072,7 @@ void cGLCD::Run(void) char tmp_start[6] = {0}; tm = localtime(&info_CurrentNext.current_zeit.startzeit); snprintf(tmp_start, sizeof(tmp_start), "%02d:%02d", tm->tm_hour, tm->tm_min); - Start = tmp_start; + Start = stagingStart = tmp_start; } if (CSectionsdClient::epgflags::has_next) @@ -1082,7 +1080,7 @@ void cGLCD::Run(void) char tmp_end[6] = {0}; tm = localtime(&info_CurrentNext.next_zeit.startzeit); snprintf(tmp_end, sizeof(tmp_end), "%02d:%02d", tm->tm_hour, tm->tm_min); - End = tmp_end; + End = stagingEnd = tmp_end; } } }