summaryrefslogtreecommitdiff
path: root/osdbase.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2010-01-17 12:08:03 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2010-01-17 12:08:03 +0100
commita503c6ab3f1763c98db5677a59d4d07bf8299025 (patch)
tree8c041b2e26b1453151f73927cdb3dacbe10b2f50 /osdbase.c
parent61c1df70040cbb9215f9735be36cf414b039a2e6 (diff)
downloadvdr-a503c6ab3f1763c98db5677a59d4d07bf8299025.tar.gz
vdr-a503c6ab3f1763c98db5677a59d4d07bf8299025.tar.bz2
The "Edit timer" menu can now set the folder for the recording from a list of folders stored in "folders.conf"
Diffstat (limited to 'osdbase.c')
-rw-r--r--osdbase.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/osdbase.c b/osdbase.c
index 9b59c050..0cdedb23 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osdbase.c 2.1 2009/06/01 11:54:50 kls Exp $
+ * $Id: osdbase.c 2.2 2010/01/17 11:36:12 kls Exp $
*/
#include "osdbase.h"
@@ -41,7 +41,7 @@ cOsdItem::~cOsdItem()
void cOsdItem::SetText(const char *Text, bool Copy)
{
free(text);
- text = Copy ? strdup(Text) : (char *)Text; // text assumes ownership!
+ text = Copy ? strdup(Text ? Text : "") : (char *)Text; // text assumes ownership!
}
void cOsdItem::SetSelectable(bool Selectable)