X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=32ffdc92b34250bff2cfa6a8fd5079f219870929;hb=a6ffcf30a926568e269b33b57f3740acfa7bb7f4;hp=a2cf48c8b96803506709da5d5b0f3f75024d28e4;hpb=16d8d1af63ea1bbdaa9223cbf3e01cb6698f1eb0;p=src%2Fagl-compositor.git

diff --git a/src/layout.c b/src/layout.c
index a2cf48c..32ffdc9 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -32,7 +32,7 @@
 
 #include <libweston/config-parser.h>
 #include <libweston/libweston.h>
-#include <libweston-desktop/libweston-desktop.h>
+#include <libweston/desktop.h>
 
 #include "agl-shell-desktop-server-protocol.h"
 
@@ -1137,7 +1137,7 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf)
 		return;
 	}
 
-	if (surf->sticky && surf->role == IVI_SURFACE_ROLE_TILE) {
+	if (surf->sticky && surf->role == IVI_SURFACE_ROLE_TILE && output->active == surf) {
 		weston_log("Application %s is already active on output %s (split role)\n",
 				app_id, output->output->name);
 		return;
@@ -1179,7 +1179,8 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf)
 
 	/* the background surface is already "maximized" so we don't need to
 	 * add to the hidden layer */
-	if (surf->role == IVI_SURFACE_ROLE_BACKGROUND) {
+	if (surf->role == IVI_SURFACE_ROLE_BACKGROUND &&
+	    output->active->role != IVI_SURFACE_ROLE_TILE) {
 		ivi_layout_activate_complete(output, surf);
 		return;
 	}