From fa85bb7c019b4ac36f73d353a9d384222ccc0bf5 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Mon, 28 Mar 2011 16:26:49 +0200
Subject: [PATCH] Some fixes in the "osddemo" plugin

---
 HISTORY                       | 5 ++++-
 PLUGINS/src/osddemo/HISTORY   | 5 +++++
 PLUGINS/src/osddemo/osddemo.c | 9 +++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/HISTORY b/HISTORY
index e72ae7e4..9590e5d7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6557,7 +6557,7 @@ Video Disk Recorder Revision History
 - The original display size of subtitles is now used to scale them properly when
   displaying them on an HD OSD.
 
-2011-03-27: Version 1.7.18
+2011-03-28: Version 1.7.18
 
 - Changed -O2 to -O3 in Make.config.template (reported by Matti Lehtimäki).
 - Added a missing 'default' case in cPixmapMemory::DrawEllipse().
@@ -6589,3 +6589,6 @@ Video Disk Recorder Revision History
   have been macros introduced to work around this problem in the first place. There
   should have been "real" format specifiers defined that address this. These macros
   are nothing but an ugly workaround.
+- Added Cancel(3) to ~cTrueColorDemo() in the "osddemo" plugin (thanks to Reinhard Nissl).
+- Added a missing font deletion in cTrueColorDemo::Action() in the "osddemo" plugin
+  (thanks to Reinhard Nissl).
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index 1270fbf6..0d9958ee 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -25,3 +25,8 @@ VDR Plugin 'osddemo' Revision History
 2011-02-20: Version 0.2.0
 
 - Added support for TrueColor OSD.
+
+2011-03-28: Version 0.2.1
+
+- Added Cancel(3) to ~cTrueColorDemo() (thanks to Reinhard Nissl).
+- Added a missing font deletion in cTrueColorDemo::Action() (thanks to Reinhard Nissl).
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index 2e6a33bf..43349471 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,13 +3,13 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: osddemo.c 2.3 2011/02/26 12:08:13 kls Exp $
+ * $Id: osddemo.c 2.4 2011/03/28 16:23:21 kls Exp $
  */
 
 #include <vdr/osd.h>
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.2.0";
+static const char *VERSION        = "0.2.1";
 static const char *DESCRIPTION    = "Demo of arbitrary OSD setup";
 static const char *MAINMENUENTRY  = "Osd Demo";
 
@@ -103,6 +103,7 @@ cTrueColorDemo::cTrueColorDemo(void)
 
 cTrueColorDemo::~cTrueColorDemo()
 {
+  Cancel(3);
   delete osd;
 }
 
@@ -262,9 +263,9 @@ void cTrueColorDemo::Action(void)
              case 3: {
                        if (cFont *Font = cFont::CreateFont(DefaultFontOsd, osd->Height() / 10)) {
                           NextPixmap = CreateTextPixmap("Millions of colors", Line, 1, clrYellow, clrTransparent, Font);
-                          if (NextPixmap) {
+                          if (NextPixmap)
                              FadeInPixmap = NextPixmap;
-                             }
+                          delete Font;
                           Start = cTimeMs::Now();
                           StartLine = Line;
                           Line += NextPixmap->DrawPort().Height();