From 2e01178e54eab038d26ecdce20014d5ad386d589 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Thu, 25 May 2006 12:26:09 +0200 Subject: [PATCH] Fixed deleting the 'skinDescriptions' in cMenuSetupOSD::~cMenuSetupOSD() --- CONTRIBUTORS | 1 + HISTORY | 4 +++- menu.c | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 98725204..b966e6de 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1877,6 +1877,7 @@ Tobias Grimm for suggesting to use geteuid() to check whether VDR is running as user 'root' for fixing a memory leak in handling external EPG data for fixing a memory leak in closing the video file during replay + for fixing deleting the 'skinDescriptions' in cMenuSetupOSD::~cMenuSetupOSD() Helge Lenz for reporting a bug in setting the 'Delta' parameter when calling the shutdown diff --git a/HISTORY b/HISTORY index 47257901..3dfa3111 100644 --- a/HISTORY +++ b/HISTORY @@ -4716,7 +4716,7 @@ Video Disk Recorder Revision History - Fixed automatically updating the CAM menu in case the whole operation (for instance a firmware update) takes longer than the menu timeout. -2006-05-20: Version 1.4.0-2 +2006-05-25: Version 1.4.0-2 - Removed leftover LSMOD=... line from 'runvdr'. - Modified the Makefile to copy additional libraries a plugin might provide (suggested @@ -4725,3 +4725,5 @@ Video Disk Recorder Revision History '-a' was given (based on a patch from Werner Fink). To avoid having to increment the API version, several #if checks have been introduced around this. These will be removed once the API version actually needs to be incremented. +- Fixed deleting the 'skinDescriptions' in cMenuSetupOSD::~cMenuSetupOSD() (thanks + to Tobias Grimm). diff --git a/menu.c b/menu.c index 950a7d9e..41947313 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 1.435 2006/04/28 12:48:01 kls Exp $ + * $Id: menu.c 1.436 2006/05/25 12:24:53 kls Exp $ */ #include "menu.h" @@ -2131,7 +2131,7 @@ cMenuSetupOSD::cMenuSetupOSD(void) cMenuSetupOSD::~cMenuSetupOSD() { cFont::SetCode(I18nCharSets()[Setup.OSDLanguage]); - delete skinDescriptions; + delete[] skinDescriptions; } void cMenuSetupOSD::Set(void)