From a9acab6b7ef720a6b5f4a9059f3d7843fb83777b Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 16 Nov 2013 13:26:55 +0100 Subject: [PATCH] Fixed uninitialized item area coordinates in cSkinLCARSDisplayMenu --- CONTRIBUTORS | 1 + HISTORY | 2 ++ skinlcars.c | 11 ++++++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index f674c496..712cc136 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2148,6 +2148,7 @@ Marko M for pointing out that "Menu button closes" should actually be "Menu key closes" for fixing a missing initialization in the c'tor of cSkinLCARSDisplayChannel for suggesting to simplify some conditional expressions in skinlcars.c and skinsttng.c + for reporting some uninitialized item area coordinates in cSkinLCARSDisplayMenu Patrick Rother for reporting a bug in defining timers that only differ in the day of week diff --git a/HISTORY b/HISTORY index bbe926c4..92fe649a 100644 --- a/HISTORY +++ b/HISTORY @@ -8063,3 +8063,5 @@ Video Disk Recorder Revision History Marko Mäkelä). - Simplified some conditional expressions in skinlcars.c and skinsttng.c (suggested by Marko Mäkelä). +- Fixed uninitialized item area coordinates in cSkinLCARSDisplayMenu (reported by + Marko Mäkelä). diff --git a/skinlcars.c b/skinlcars.c index dc1afe6d..d652251e 100644 --- a/skinlcars.c +++ b/skinlcars.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: skinlcars.c 3.5 2013/11/15 15:33:00 kls Exp $ + * $Id: skinlcars.c 3.6 2013/11/16 13:20:19 kls Exp $ */ // "Star Trek: The Next Generation"(R) is a registered trademark of Paramount Pictures, @@ -900,6 +900,15 @@ cSkinLCARSDisplayMenu::cSkinLCARSDisplayMenu(void) ys03 = ys04 - Gap; ys05 = yb15; + // The item area (just to have them initialized, actual setting will be done in SetMenuCategory(): + + xi00 = 0; + xi01 = 0; + xi02 = 0; + xi03 = 1; + yi00 = 0; + yi01 = 1; + // The color buttons in submenus: xb00 = xa06; xb15 = xa07;