diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2014-02-06 11:57:51 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2014-02-06 11:57:51 +0100 |
| commit | 0402ce9b8e7eba020fcfd1e60e450bf523ea0cf2 (patch) | |
| tree | 221461c6f57199906f1a92cdd37d0a1fbfda2a46 | |
| parent | e2f0edd8f631aa1af3afcaf9d41538939b6358b0 (diff) | |
| download | vdr-0402ce9b8e7eba020fcfd1e60e450bf523ea0cf2.tar.gz vdr-0402ce9b8e7eba020fcfd1e60e450bf523ea0cf2.tar.bz2 | |
Fixed a possible crash in the OSD demo
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | PLUGINS/src/osddemo/HISTORY | 3 | ||||
| -rw-r--r-- | PLUGINS/src/osddemo/osddemo.c | 4 |
4 files changed, 7 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 4028f101..4705c79e 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2926,6 +2926,7 @@ Christopher Reimer <reimer.christopher@freenet.de> for suggesting to make sure that plugins include the VDR header files from the actual VDR source directory when doing "make plugins" for reverting the change from version 1.5.7 that made all logging go to LOG_ERR + 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 @@ -8190,3 +8190,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 a542f242..4c3bfe64 100644 --- a/PLUGINS/src/osddemo/HISTORY +++ b/PLUGINS/src/osddemo/HISTORY @@ -64,6 +64,7 @@ VDR Plugin 'osddemo' Revision History - Avoiding unnecessary pkg-config warnings in plugin Makefiles. -2014-02-04: Version 2.1.2 +2014-02-06: Version 2.1.2 - 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 372fb657..0a826b77 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 3.2 2014/02/04 10:41:50 kls Exp $ + * $Id: osddemo.c 3.3 2014/02/06 11:51:53 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; |