From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 18 May 2021 09:20:56 +0000 (+0200)
Subject: ucm: libconfig - merge not override items
X-Git-Tag: v1.2.5~15
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=225d3aecb6d14632c19d7899aff30bf1556b9dd6;p=alsa-lib.git

ucm: libconfig - merge not override items

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

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;
 	}