mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Made cOsd::DestroyPixmap() "NULL proof"
This commit is contained in:
parent
e5295be30a
commit
8ef71dbbdf
3
HISTORY
3
HISTORY
@ -7585,7 +7585,7 @@ Video Disk Recorder Revision History
|
||||
- Fixed formatting and removed some superfluous break statements in vdr.c's command
|
||||
line option switch.
|
||||
|
||||
2013-02-12: Version 1.7.38
|
||||
2013-02-13: Version 1.7.38
|
||||
|
||||
- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
|
||||
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
|
||||
@ -7605,3 +7605,4 @@ Video Disk Recorder Revision History
|
||||
characters (reported by Andre Weidemann).
|
||||
- Fixed the description of the OSD drawing functions DrawEllipse() (the values -5...-8
|
||||
for the Quadrants parameter are not implemented).
|
||||
- Made cOsd::DestroyPixmap() "NULL proof".
|
||||
|
4
osd.c
4
osd.c
@ -4,7 +4,7 @@
|
||||
* See the main source file 'vdr.c' for copyright information and
|
||||
* how to reach the author.
|
||||
*
|
||||
* $Id: osd.c 2.35 2013/02/08 10:16:47 kls Exp $
|
||||
* $Id: osd.c 2.36 2013/02/13 12:52:07 kls Exp $
|
||||
*/
|
||||
|
||||
#include "osd.h"
|
||||
@ -1699,7 +1699,7 @@ cPixmap *cOsd::CreatePixmap(int Layer, const cRect &ViewPort, const cRect &DrawP
|
||||
|
||||
void cOsd::DestroyPixmap(cPixmap *Pixmap)
|
||||
{
|
||||
if (isTrueColor) {
|
||||
if (Pixmap) {
|
||||
LOCK_PIXMAPS;
|
||||
for (int i = 1; i < pixmaps.Size(); i++) { // begin at 1 - don't let the background pixmap be destroyed!
|
||||
if (pixmaps[i] == Pixmap) {
|
||||
|
Loading…
Reference in New Issue
Block a user