From: Marius Vlad <marius.vlad@collabora.com>
Date: Tue, 13 Jun 2023 11:04:40 +0000 (+0300)
Subject: layout: Give ini config precedence over agl_shell
X-Git-Tag: 17.90.0~20
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=ffdbb335ee72a5b5cba198800c5537b89d7755a0;p=src%2Fagl-compositor.git

layout: Give ini config precedence over agl_shell

The activation area can set-up with agl_shell as well, so give
the ini configuration file precedence over the one set-up by
agl_shell.

Bug-AGL: SPEC-4829
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: Ifae82b8c29575e7a9a06422588ad6a8cce80946e
---

diff --git a/src/layout.c b/src/layout.c
index 8c8b4be..082c36e 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -170,6 +170,12 @@ ivi_layout_init(struct ivi_compositor *ivi, struct ivi_output *output)
 			if (parse_activation_area(t, output) < 0)
 				weston_log("Invalid activation-area \"%s\" for output %s\n",
 					   t, output->name);
+		} else {
+			weston_log("WARNING: activation-area detected in ini file, "
+					"but agl_shell override detected!\n");
+			if (parse_activation_area(t, output) < 0)
+				weston_log("Invalid activation-area \"%s\" for output %s\n",
+					   t, output->name);
 		}
 	}
 	free(t);