summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2014-02-06 12:00:36 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2014-02-06 12:00:36 +0100
commitfb66c3ec6b9a5d5e9211d46b7b030d55a3d02c05 (patch)
treeb5400038ef5686b1186d4bb3aa4358fc6f6726c5
parent7d6c54d63a0707409f0a87d2328dd0bf58a30190 (diff)
downloadvdr-fb66c3ec6b9a5d5e9211d46b7b030d55a3d02c05.tar.gz
vdr-fb66c3ec6b9a5d5e9211d46b7b030d55a3d02c05.tar.bz2
Fixed a possible crash in the OSD demo
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY1
-rw-r--r--PLUGINS/src/osddemo/HISTORY3
-rw-r--r--PLUGINS/src/osddemo/osddemo.c4
4 files changed, 7 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a8f3a8d4..2718c3c9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2898,6 +2898,7 @@ Christopher Reimer <reimer.christopher@freenet.de>
for making plugin Makefiles use DESTDIR and the 'install' program
for suggesting to make sure that plugins include the VDR header files from the actual
VDR source directory when doing "make plugins"
+ for reporting a possible crash in the OSD demo
Stefan Huskamp <coca_cola1@gmx.de>
for suggesting to make entering characters via the number keys
diff --git a/HISTORY b/HISTORY
index 2a066eb3..c11f913e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7894,3 +7894,4 @@ Video Disk Recorder Revision History
marks (which will now be off by one) can still be cut with all VDR versions from
1.7.32, because these will automatically adjust editing marks to I-frames.
Users of stable releases shouldn't notice any problems.
+- Fixed a possible crash in the OSD demo (reported by Christopher Reimer).
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index b334ad11..99674af0 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -60,6 +60,7 @@ VDR Plugin 'osddemo' Revision History
- Official release.
-2014-02-04: Version 2.0.1
+2014-02-06: Version 2.0.1
- Fixed flickering if subtitles are active while the OSD demo is running.
+- Fixed a possible crash in the OSD demo (reported by Christopher Reimer).
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index f86fdf56..296fc785 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: osddemo.c 2.12.1.1 2014/02/04 10:48:10 kls Exp $
+ * $Id: osddemo.c 2.12.1.2 2014/02/06 11:59:40 kls Exp $
*/
#include <vdr/osd.h>
@@ -480,6 +480,8 @@ void cTrueColorDemo::Action(void)
if (Delta < FrameTime)
cCondWait::SleepMs(FrameTime - Delta);
}
+ destroyablePixmap = NULL;
+ toggleablePixmap = NULL;
delete OsdFont;
delete SmlFont;
delete LrgFont;