From 49f7a7f57470e5b941073a0cccf50425279600d1 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Tue, 1 Jan 2008 15:10:07 +0100
Subject: Fixed cVector::Clear() and cStringList::Clear()

---
 HISTORY | 3 ++-
 tools.c | 3 ++-
 tools.h | 7 +++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/HISTORY b/HISTORY
index 504dabb3..0969a5af 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5529,7 +5529,7 @@ Video Disk Recorder Revision History
 - Fixed stopping live subtitles when a player is attached to the device.
 - Fixed suddenly stopping subtitles in live mode.
 
-2007-12-27: Version 1.5.13
+2008-01-13: Version 1.5.13
 
 - Fixed the declaration of cSubtitleObject::Decode8BppCodeString() (thanks to
   Gregoire Favre).
@@ -5539,3 +5539,4 @@ Video Disk Recorder Revision History
   in a context sensitive manner (suggested by Andreas Brugger). If there is
   no menu open it will show the info of the current broadcast or replay.
 - cTimeMs now uses the monotonic clock, if available (thanks to Petri Hintukainen).
+- Fixed cVector::Clear() and cStringList::Clear().
diff --git a/tools.c b/tools.c
index 2f8e0789..79b7c347 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.138 2007/12/27 15:57:49 kls Exp $
+ * $Id: tools.c 1.139 2008/01/01 15:10:07 kls Exp $
  */
 
 #include "tools.h"
@@ -1209,6 +1209,7 @@ void cStringList::Clear(void)
 {
   for (int i = 0; i < Size(); i++)
       free(At(i));
+  cVector<char *>::Clear();
 }
 
 // --- cFileNameList ---------------------------------------------------------
diff --git a/tools.h b/tools.h
index 28dbd5ea..1239176d 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.108 2007/08/25 14:16:39 kls Exp $
+ * $Id: tools.h 1.109 2008/01/01 15:09:25 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -470,7 +470,10 @@ public:
        memmove(&data[Index], &data[Index + 1], (size - Index) * sizeof(T));
     size--;
   }
-  virtual void Clear(void) {}
+  virtual void Clear(void)
+  {
+    size = 0;
+  }
   void Sort(__compar_fn_t Compare)
   {
     qsort(data, size, sizeof(T), Compare);
-- 
cgit v1.2.3