summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2021-05-18 11:20:56 +0200
committerJaroslav Kysela <perex@perex.cz>2021-05-18 11:30:21 +0200
commit225d3aecb6d14632c19d7899aff30bf1556b9dd6 (patch)
tree8cdd780c6b618ec2871bca58e4110d628f2c08da
parentb2b3658fb9df910cb79dfc715e3e8767ffee41a5 (diff)
downloadalsa-lib-225d3aecb6d14632c19d7899aff30bf1556b9dd6.tar.gz
ucm: libconfig - merge not override items
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-rw-r--r--src/ucm/parser.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ucm/parser.c b/src/ucm/parser.c
index c6687a49..ed261fa2 100644
--- a/src/ucm/parser.c
+++ b/src/ucm/parser.c
@@ -460,7 +460,7 @@ static int parse_libconfig1(snd_use_case_mgr_t *uc_mgr, snd_config_t *cfg)
snd_config_delete(cfg);
return err;
}
- err = snd_config_merge(uc_mgr->local_config, cfg, 1);
+ err = snd_config_merge(uc_mgr->local_config, cfg, 0);
if (err < 0) {
snd_config_delete(cfg);
return err;
@@ -483,7 +483,7 @@ static int parse_libconfig1(snd_use_case_mgr_t *uc_mgr, snd_config_t *cfg)
if (err < 0)
return err;
}
- err = snd_config_merge(uc_mgr->local_config, config, 1);
+ err = snd_config_merge(uc_mgr->local_config, config, 0);
if (err < 0)
return err;
}