summaryrefslogtreecommitdiff
path: root/PLUGINS/src
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2008-02-17 13:47:12 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2008-02-17 13:47:12 +0100
commitdc7c5464fc07b31b904ea8118f104a7cb289dd24 (patch)
tree9132d34f62d493b6d66059003eb36eb341a36ef1 /PLUGINS/src
parent54b4d4e4e752ce10142c1f0c61f39c3782e460d9 (diff)
downloadvdr-dc7c5464fc07b31b904ea8118f104a7cb289dd24.tar.gz
vdr-dc7c5464fc07b31b904ea8118f104a7cb289dd24.tar.bz2
Introduced 'operator const void * ()' in cString
Diffstat (limited to 'PLUGINS/src')
-rw-r--r--PLUGINS/src/pictures/HISTORY4
-rw-r--r--PLUGINS/src/pictures/entry.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index 18966579..b0952abf 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -19,6 +19,8 @@ VDR Plugin 'pictures' Revision History
- Added option -i to pic2mpg to ignore unknown file types.
-2008-02-09: Version 0.0.5
+2008-02-17: Version 0.0.5
- Fixed setting the OSD area.
+- Introduced 'operator const void * ()' in cString to catch cases where operator*()
+ should be used.
diff --git a/PLUGINS/src/pictures/entry.c b/PLUGINS/src/pictures/entry.c
index e03858c9..427585e6 100644
--- a/PLUGINS/src/pictures/entry.c
+++ b/PLUGINS/src/pictures/entry.c
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: entry.c 1.2 2008/01/18 15:49:51 kls Exp $
+ * $Id: entry.c 1.3 2008/02/17 13:42:34 kls Exp $
*/
#include "entry.h"
@@ -37,7 +37,7 @@ int cPictureEntry::Compare(const cListObject &ListObject) const
cString cPictureEntry::Path(void) const
{
- return parent ? AddDirectory(parent->Path(), name) : name;
+ return parent ? *AddDirectory(parent->Path(), name) : name;
}
void cPictureEntry::Load(void) const