]> git.alsa-project.org Git - alsa-lib.git/commitdiff
ucm: libconfig - merge not override items
authorJaroslav Kysela <perex@perex.cz>
Tue, 18 May 2021 09:20:56 +0000 (11:20 +0200)
committerJaroslav Kysela <perex@perex.cz>
Tue, 18 May 2021 09:30:21 +0000 (11:30 +0200)
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
src/ucm/parser.c

index c6687a4960beb1d6c635128f98a925168a4703e1..ed261fa2a213865861881efb844da59ba0200231 100644 (file)
@@ -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;
        }