X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=b1d8b3d41f888d59e27784f728a21d963fe5b558;hb=80febb3fbcebe88a274ffa5109784d5f0ad69ca5;hp=0345807f3a3f9b85df7bd368824a0708684641ef;hpb=06e9aa93360beb8a25f2cef78576d1bf0c211a98;p=src%2Fagl-compositor.git

diff --git a/src/layout.c b/src/layout.c
index 0345807..b1d8b3d 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -328,6 +328,12 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 			return;
 		}
 
+		if (!surf->ivi->activate_by_default) {
+			weston_log("Refusing to activate surface role %d, app_id %s\n",
+					surf->role, app_id);
+			return;
+		}
+
 		/* use the output of the bg to activate the app on start-up by
 		 * default */
 		if (surf->view && r_output) {
@@ -745,6 +751,9 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id)
 	struct ivi_surface *surf;
 	struct ivi_compositor *ivi = output->ivi;
 
+	if (!app_id)
+		return;
+
 	surf = ivi_find_app(ivi, app_id);
 	if (!surf)
 		return;
@@ -798,6 +807,9 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
 	struct ivi_output *ivi_output;
 	struct ivi_policy *policy = ivi->policy;
 
+	if (!app_id)
+		return;
+
 	surf = ivi_find_app(ivi, app_id);
 	if (!surf)
 		return;