From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 20 May 2020 17:34:15 +0000 (+0200)
Subject: ucm: config - change the in-place include evaluation order
X-Git-Tag: v1.2.3~42
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=f33e596fa6e2003dc366dcb3e57bf667bc4bd383;p=alsa-lib.git

ucm: config - change the in-place include evaluation order

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

diff --git a/src/ucm/parser.c b/src/ucm/parser.c
index 63441e78..94b0d37a 100644
--- 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;