X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fshell.c;h=ac20b4fcb942ee1278fb291946aa8623e7834854;hb=998097db427c6aeb61e62cd6cf7ad3821e7d0372;hp=c3459e79067026c8a48a21cb138ff417fa7056ed;hpb=4a1684308bd6a17c5b112d30e672c40fd348fef3;p=src%2Fagl-compositor.git

diff --git a/src/shell.c b/src/shell.c
index c3459e7..ac20b4f 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -706,7 +706,7 @@ ivi_check_pending_desktop_surface(struct ivi_surface *surface)
 	ret = ivi_check_pending_desktop_surface_remote(surface);
 	if (ret) {
 		ivi_set_desktop_surface_remote(surface);
-		ivi_layout_desktop_committed(surface);
+		ivi_layout_remote_committed(surface);
 		return;
 	}
 
@@ -1172,7 +1172,8 @@ void
 shell_send_app_on_output(struct ivi_compositor *ivi, const char *app_id,
 			 const char *output_name)
 {
-	if (app_id && wl_resource_get_version(ivi->shell_client.resource) >=
+	if (app_id && ivi->shell_client.resource &&
+	    wl_resource_get_version(ivi->shell_client.resource) >=
 	    AGL_SHELL_APP_ON_OUTPUT_SINCE_VERSION) {
 
 		agl_shell_send_app_on_output(ivi->shell_client.resource,