layout: Fix no-op check due to invalid checks

[src/agl-compositor.git] / src / shell.c

diff --git a/src/shell.c b/src/shell.c
index c3459e7..ac20b4f 100644 (file)
--- 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,