diff options
| -rw-r--r-- | HISTORY | 4 | ||||
| -rw-r--r-- | config.c | 4 |
2 files changed, 5 insertions, 3 deletions
@@ -8882,7 +8882,7 @@ Video Disk Recorder Revision History - Added a short sleep to cTSBuffer::Action() to avoid high CPU usage (thanks to Sergey Chernyavskiy). -2017-01-23: Version 2.3.3 +2017-02-14: Version 2.3.3 - Added 'S3W ABS-3A' to sources.conf (thanks to Frank Richter). - Fixed a possible deadlock in the recordings handler thread. @@ -8910,3 +8910,5 @@ Video Disk Recorder Revision History - The LCARS skin now displays the master CAM's number when a device is tuned to an encrypted channel. - The Setup/CAM menu now only displays master CAMs. +- Fixed setting the local machine's SVDRP host name (was overwritten if setup.conf + contained an empty string). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.c 4.4 2015/09/13 11:09:44 kls Exp $ + * $Id: config.c 4.5 2017/02/14 11:02:48 kls Exp $ */ #include "config.h" @@ -640,7 +640,7 @@ bool cSetup::Parse(const char *Name, const char *Value) else if (!strcasecmp(Name, "EPGLinger")) EPGLinger = atoi(Value); else if (!strcasecmp(Name, "SVDRPTimeout")) SVDRPTimeout = atoi(Value); else if (!strcasecmp(Name, "SVDRPPeering")) SVDRPPeering = atoi(Value); - else if (!strcasecmp(Name, "SVDRPHostName")) strn0cpy(SVDRPHostName, Value, sizeof(SVDRPHostName)); + else if (!strcasecmp(Name, "SVDRPHostName")) { if (!*SVDRPHostName) strn0cpy(SVDRPHostName, Value, sizeof(SVDRPHostName)); } else if (!strcasecmp(Name, "SVDRPdefaultHost")) strn0cpy(SVDRPDefaultHost, Value, sizeof(SVDRPDefaultHost)); else if (!strcasecmp(Name, "ZapTimeout")) ZapTimeout = atoi(Value); else if (!strcasecmp(Name, "ChannelEntryTimeout")) ChannelEntryTimeout= atoi(Value); |