From 939071bf254a46d15279351110f398f711e299e4 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Fri, 19 Jan 2024 12:10:47 +0100 Subject: [PATCH] Fixed an unnecessary double display of the current menu item in page up/down --- CONTRIBUTORS | 1 + HISTORY | 4 +++- osdbase.c | 10 +++------- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 0526c587..b79adc9d 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3395,6 +3395,7 @@ Matthias Senzel of recordings was not updated immediately for fixing restoring the volume at program start for fixing height calculation in progress display + for fixing an unnecessary double display of the current menu item in page up/down Marek Nazarko for translating OSD texts to the Polish language diff --git a/HISTORY b/HISTORY index 55bf505f..73987a18 100644 --- a/HISTORY +++ b/HISTORY @@ -9863,7 +9863,7 @@ Video Disk Recorder Revision History - The recording info of the default skins now shows the frame parameters of the recording at the end of the description (if such information is available). -2024-01-18: +2024-01-19: - Changed installing config files to handle potentially broken 'cp -n'. - Fixed height calculation in progress display (thanks to Matthias Senzel). @@ -9873,3 +9873,5 @@ Video Disk Recorder Revision History more (thanks to Markus Ehrnsperger). - Implemented scaling images (thanks to Andreas Baierl). - Removed syslog calls in child process after fork() (thanks to Markus Ehrnsperger). +- Fixed an unnecessary double display of the current menu item in page up/down + (thanks to Matthias Senzel). diff --git a/osdbase.c b/osdbase.c index d555af98..d53ca1c1 100644 --- a/osdbase.c +++ b/osdbase.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: osdbase.c 4.5 2018/03/24 11:47:45 kls Exp $ + * $Id: osdbase.c 5.1 2024/01/19 12:10:47 kls Exp $ */ #include "osdbase.h" @@ -447,10 +447,8 @@ void cOsdMenu::PageUp(void) else if (current - first >= displayMenuItems) first = current - displayMenuItems + 1; } - if (current != oldCurrent || first != oldFirst) { + if (current != oldCurrent || first != oldFirst) Display(); - DisplayCurrent(true); - } else if (Setup.MenuScrollWrap) CursorUp(); } @@ -481,10 +479,8 @@ void cOsdMenu::PageDown(void) else if (current - first >= displayMenuItems) first = current - displayMenuItems + 1; } - if (current != oldCurrent || first != oldFirst) { + if (current != oldCurrent || first != oldFirst) Display(); - DisplayCurrent(true); - } else if (Setup.MenuScrollWrap) CursorDown(); }