X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;fp=src%2Flayout.c;h=89c2097f99dcdcd4ff854b9aabeebe0a45912fb5;hb=8033c46081b93f19843d140e58b527af7abf7a4f;hp=082c36ed7175a48bfb350d2c3ec506d2fd3d3ce7;hpb=ffdbb335ee72a5b5cba198800c5537b89d7755a0;p=src%2Fagl-compositor.git

diff --git a/src/layout.c b/src/layout.c
index 082c36e..89c2097 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -581,7 +581,7 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 			return;
 		}
 
-		if (!surf->ivi->activate_by_default) {
+		if (!surf->ivi->activate_by_default && !surf->xwayland.is_set) {
 			weston_log("Refusing to activate surface role %d, app_id %s\n",
 					surf->role, app_id);
 
@@ -611,7 +611,12 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 				 */
 				weston_log("Surface no app_id, role %s activating by default\n",
 					ivi_layout_get_surface_role_name(surf));
-				ivi_layout_activate_by_surf(r_output, surf);
+				if (surf->xwayland.is_set) {
+					ivi_layout_activate_by_surf(r_output, surf);
+					ivi_layout_activate_complete(r_output, surf);
+				} else {
+					ivi_layout_activate_by_surf(r_output, surf);
+				}
 			}
 		}