X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Flayout.c;h=95370340547f2b6cc9baa0b9838b8421a9737681;hb=fcd71e034d378921e0408a69dedcd8d0f4836401;hp=94327c4b0adef94f65c916ce96c518551d9f242f;hpb=1ee1bff64338dede1f72981a6f3787718ce47335;p=src%2Fagl-compositor.git

diff --git a/src/layout.c b/src/layout.c
index 94327c4..9537034 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -251,7 +251,12 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 
 		if (!surf->ivi->quirks.activate_apps_by_default)
 			return;
+
 skip_config_check:
+		/* we can only activate it again by using the protocol */
+		if (surf->activated_by_default)
+			return;
+
 		ivi_bg_output = ivi_layout_find_bg_output(surf->ivi);
 
 		/* use the output of the bg to activate the app on start-up by
@@ -259,8 +264,10 @@ skip_config_check:
 		if (surf->view && ivi_bg_output) {
 			const char *app_id =
 				weston_desktop_surface_get_app_id(dsurf);
-			if (app_id && ivi_bg_output)
+			if (app_id && ivi_bg_output) {
 				ivi_layout_activate(ivi_bg_output, app_id);
+				surf->activated_by_default = true;
+			}
 		}
 
 		return;