summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY3
-rw-r--r--osd.c6
2 files changed, 4 insertions, 5 deletions
diff --git a/HISTORY b/HISTORY
index b35eb7fd..70cb1cc3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7417,8 +7417,9 @@ Video Disk Recorder Revision History
plugins to display these items in a more elaborate way than just a simple line of
text.
-2012-12-11: Version 1.7.34
+2012-12-15: Version 1.7.34
- Changed the type of the TimerMatch parameter in cSkinDisplayMenu::SetItemEvent() from
'int' to 'eTimerEvent' (reported by Christoph Haubrich).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
+- Fixed cOsd::GetBitmap() to always return NULL if a non-exising area is requested.
diff --git a/osd.c b/osd.c
index d82a27bc..75f13f4b 100644
--- a/osd.c
+++ b/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.32 2012/06/09 14:37:24 kls Exp $
+ * $Id: osd.c 2.33 2012/12/15 11:16:41 kls Exp $
*/
#include "osd.h"
@@ -1683,9 +1683,7 @@ void cOsd::SetAntiAliasGranularity(uint FixedColors, uint BlendColors)
cBitmap *cOsd::GetBitmap(int Area)
{
- if (isTrueColor)
- Area = 0; // returns the dummy bitmap
- return Area < numBitmaps ? bitmaps[Area] : NULL;
+ return Area < numBitmaps ? (isTrueColor ? bitmaps[0] : bitmaps[Area]) : NULL;
}
cPixmap *cOsd::CreatePixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort)