X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fshell.c;h=0f2e6441c4027d0cc792ddfa25e6d421308bcb01;hb=63b6b6b1e140e0abb3bcc6b706ba7a57b5fceb04;hp=cc7b33b4a8c2e0b2ba223d714c193ea6d9effd31;hpb=225415dcbada40cabc9bcaa5974ed5436c58b0e0;p=src%2Fagl-compositor.git

diff --git a/src/shell.c b/src/shell.c
index cc7b33b..0f2e644 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -307,7 +307,13 @@ shell_ready(struct wl_client *client, struct wl_resource *shell_res)
 
 	wl_list_for_each_safe(surface, tmp, &ivi->pending_surfaces, link) {
 		wl_list_remove(&surface->link);
-		ivi_set_desktop_surface(surface);
+
+		if (ivi_check_pending_desktop_surface_popup(surface)) {
+			ivi_set_desktop_surface_popup(surface);
+		} else {
+			ivi_set_desktop_surface(surface);
+			ivi_layout_desktop_committed(surface);
+		}
 	}
 }