Fix bug caused by regtype not being initialised under some circumetances.

This commit is contained in:
Mike Brady
2016-04-24 10:15:25 +01:00
parent ed4ec933e7
commit 223fba3818
2 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.50])
AC_INIT([shairport-sync], [2.8.2], [mikebrady@eircom.net])
AC_INIT([shairport-sync], [2.8.3], [mikebrady@eircom.net])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([shairport.c])
AC_CONFIG_HEADERS([config.h])
+3 -2
View File
@@ -414,8 +414,6 @@ int parse_options(int argc, char **argv) {
/* Get the regtype -- the service type and protocol, separated by a dot. Default is "_raop._tcp" */
if (config_lookup_string(config.cfg, "general.regtype", &str))
config.regtype = strdup(str);
else
config.regtype = strdup("_raop._tcp");
/* Get the volume range, in dB, that should be used If not set, it means you just use the range set by the mixer. */
@@ -575,6 +573,9 @@ int parse_options(int argc, char **argv) {
config.metadata_pipename=strdup("/tmp/shairport-sync-metadata");
#endif
/* if the regtype hasn't been set, do it now */
if (config.regtype==NULL)
config.regtype = strdup("_raop._tcp");
if (tdebuglev!=0)
debuglev = tdebuglev;