mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-02 09:01:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ucm: libconfig - merge not override items

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2021-05-18 11:20:56 +02:00
parent b2b3658fb9
commit 225d3aecb6
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ucm/parser.c
View 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;
}