summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2013-02-14 15:52:54 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2013-02-14 15:52:54 +0100
commit410968304cfd06f077386e8a5db62120abac3f8c (patch)
tree5d4a977274d5da26717bf6162ffaf1339441ee93
parent11e04d4228b00126fa2a9992a6b6e264d8d71ea3 (diff)
downloadvdr-410968304cfd06f077386e8a5db62120abac3f8c.tar.gz
vdr-410968304cfd06f077386e8a5db62120abac3f8c.tar.bz2
Fixed the return value of cOsdProvider::StoreImage() in case there is no OSD provider
-rw-r--r--HISTORY1
-rw-r--r--osd.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 8acb3272..87d9cbc5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7618,3 +7618,4 @@ Video Disk Recorder Revision History
- Moved the definition of TIMERMACRO_TITLE and TIMERMACRO_EPISODE from recording.h to
config.h and using them to initialize Setup.NameInstantRecord (avoids having the same
information in two places).
+- Fixed the return value of cOsdProvider::StoreImage() in case there is no OSD provider.
diff --git a/osd.c b/osd.c
index f6d2168a..cc652b62 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.37 2013/02/13 12:55:26 kls Exp $
+ * $Id: osd.c 2.38 2013/02/14 15:50:19 kls Exp $
*/
#include "osd.h"
@@ -2057,7 +2057,7 @@ int cOsdProvider::StoreImage(const cImage &Image)
{
if (osdProvider)
return osdProvider->StoreImageData(Image);
- return -1;
+ return 0;
}
void cOsdProvider::DropImage(int ImageHandle)