layout: Do not attempt to activate surfaces that doesn't have a valid app_id 85/25585/3 10.91.0 koi/10.91.0 koi_10.91.0
authorMarius Vlad <marius.vlad@collabora.com>
Wed, 18 Nov 2020 13:54:39 +0000 (15:54 +0200)
committerMarius Vlad <marius.vlad@collabora.com>
Thu, 19 Nov 2020 12:28:35 +0000 (12:28 +0000)
Observed when trying to activate (a previous one, as a result
of deactivation) a surface that didn't had an application id set.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I3c39ae7dfb237e53f4b2bad64e7bc5ef91a76f0c

src/layout.c

index 0345807..0363af7 100644 (file)
@@ -745,6 +745,9 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id)
        struct ivi_surface *surf;
        struct ivi_compositor *ivi = output->ivi;
 
+       if (!app_id)
+               return;
+
        surf = ivi_find_app(ivi, app_id);
        if (!surf)
                return;
@@ -798,6 +801,9 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
        struct ivi_output *ivi_output;
        struct ivi_policy *policy = ivi->policy;
 
+       if (!app_id)
+               return;
+
        surf = ivi_find_app(ivi, app_id);
        if (!surf)
                return;