oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

config/File: allow overriding top-level settings in includes 

Remove the error message and instead erase the old setting if the
"repeatable" flag is not set.

https://github.com/MusicPlayerDaemon/MPD/issues/684
This commit is contained in:
Max Kellermann 2020-01-17 14:58:40 +01:00
parent ce7ec2b3f5
commit 4f11fa0d41
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,4 +1,6 @@
ver 0.21.19 (not yet released) ver 0.21.19 (not yet released)
* configuration
- allow overriding top-level settings in includes
* output * output
- pulse: obey Pulse's maximum sample rate (fixes DSD128 playback) - pulse: obey Pulse's maximum sample rate (fixes DSD128 playback)
* fix build failure with clang 10 * fix build failure with clang 10

8
src/config/File.cxx
View File

@ -153,11 +153,9 @@ ReadConfigParam(ConfigData &config_data, BufferedReader &reader,
name, reader.GetLineNumber()); name, reader.GetLineNumber());
if (!option.repeatable) if (!option.repeatable)
if (const auto *param = config_data.GetParam(o)) /* if the option is not repeatable, override the old
throw FormatRuntimeError("config parameter \"%s\" is first defined " value by removing it first */
"on line %d and redefined on line %u\n", config_data.GetParamList(o).clear();
name, param->line,
reader.GetLineNumber());
/* now parse the block or the value */ /* now parse the block or the value */