OSDN Git Service
(root)
/
android-x86
/
external-alsa-lib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9c88ead
)
ucm: config - change the in-place include evaluation order
author
Jaroslav Kysela
<perex@perex.cz>
Wed, 20 May 2020 17:34:15 +0000
(19:34 +0200)
committer
Jaroslav Kysela
<perex@perex.cz>
Mon, 25 May 2020 17:20:53 +0000
(19:20 +0200)
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
src/ucm/parser.c
patch
|
blob
|
history
diff --git
a/src/ucm/parser.c
b/src/ucm/parser.c
index
63441e7
..
94b0d37
100644
(file)
--- a/
src/ucm/parser.c
+++ b/
src/ucm/parser.c
@@
-369,6
+369,10
@@
int uc_mgr_evaluate_inplace(snd_use_case_mgr_t *uc_mgr,
err2 = evaluate_include(uc_mgr, cfg);
if (err2 < 0)
return err2;
+ /* include may define another variables */
+ /* conditions may depend on them */
+ if (err2 == 0)
+ continue;
err3 = evaluate_condition(uc_mgr, cfg);
if (err3 < 0)
return err3;