Make getBoolConfigParam and save_absolute_paths_in_playlist less stupid

git-svn-id: https://svn.musicpd.org/mpd/trunk@4419 09075e82-0dd4-0310-85a5-a0d7c8717e4f

2 files changed, 9 insertions, 2 deletions

diff --git a/src/conf.c b/src/conf.c
index 2a5ea9e5..2a0ab207 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -372,7 +372,7 @@ int getBoolConfigParam(char *name)
 	if (strcmp("yes", param->value) == 0) return 1;
 	else if (strcmp("no", param->value) == 0) return 0;
 
-	return -1;
+	return -2;
 }
 
 BlockParam *getBlockParam(ConfigParam * param, char *name)
diff --git a/src/playlist.c b/src/playlist.c
index c7ef9d17..fce6cfe3 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -167,7 +167,14 @@ void initPlaylist(void)
 	}
 
 	playlist_saveAbsolutePaths = getBoolConfigParam(CONF_SAVE_ABSOLUTE_PATHS);
-	playlist_saveAbsolutePaths = playlist_saveAbsolutePaths < 0 ? 0 : playlist_saveAbsolutePaths;
+	if (playlist_saveAbsolutePaths == -1) playlist_saveAbsolutePaths = 0;
+	else if (playlist_saveAbsolutePaths < 0) {
+		param = getConfigParam(CONF_SAVE_ABSOLUTE_PATHS);
+		ERROR("%s is not \"yes\" or \"no\" on line %i\n"
+		      CONF_SAVE_ABSOLUTE_PATHS,
+		      param->value, param->line);
+		exit(EXIT_FAILURE);
+	}
 
 	playlist.songs = malloc(sizeof(Song *) * playlist_max_length);
 	playlist.songMod = malloc(sizeof(mpd_uint32) * playlist_max_length);