From 0468b38ff3754bb195688fb2ec6314835e028125 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Tue, 3 Nov 2020 22:12:38 +0100 Subject: Fixed an unnecessary double call to Display() in cMenuRecording::RefreshRecording() --- CONTRIBUTORS | 1 + HISTORY | 4 +++- menu.c | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 4ecfe785..29cbae75 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2442,6 +2442,7 @@ Christoph Haubrich for reporting a problem with data loss in case renaming a recording fails for adding support for HEVC-video and AC-4-audio for implementing anti-aliasing for cPixmap::DrawSlope() and cPixmap::DrawEllipse() + for reporting an unnecessary double call to Display() in cMenuRecording::RefreshRecording() Pekka Mauno for fixing cSchedule::GetFollowingEvent() in case there is currently no present diff --git a/HISTORY b/HISTORY index 81762c2f..f41fc285 100644 --- a/HISTORY +++ b/HISTORY @@ -9536,7 +9536,9 @@ Video Disk Recorder Revision History cDvbTuner::GetSignalStats() to avoid problems with drivers that don't do this (thanks to Helmut Binder). -2020-10-30: +2020-11-03: - Fixed multiple recording entries in case a recording is started during the initial reading of the video directory (reported by Claus Muus). +- Fixed an unnecessary double call to Display() in cMenuRecording::RefreshRecording() + (reported by Christoph Haubrich). diff --git a/menu.c b/menu.c index 901ec5a3..071d9292 100644 --- a/menu.c +++ b/menu.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 4.85 2020/09/16 13:48:33 kls Exp $ + * $Id: menu.c 4.86 2020/11/03 22:12:38 kls Exp $ */ #include "menu.h" @@ -2834,6 +2834,8 @@ cMenuRecording::cMenuRecording(const cRecording *Recording, bool WithButtons) :cOsdMenu(tr("Recording info")) { SetMenuCategory(mcRecordingInfo); + if (cRecordings::GetRecordingsRead(recordingsStateKey)) // initializes recordingsStateKey, so we don't call Display() unnecessarily + recordingsStateKey.Remove(); recording = Recording; originalFileName = recording->FileName(); withButtons = WithButtons; -- cgit v1.2.3