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: Some fixes in the "osddemo" plugin

---
 PLUGINS/src/osddemo/osddemo.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'PLUGINS/src/osddemo/osddemo.c')

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();
-- 
cgit v1.2.3