shell: Check for a valid ivi_surface 04/28504/1
authorMarius Vlad <marius.vlad@collabora.com>
Wed, 15 Feb 2023 15:49:50 +0000 (17:49 +0200)
committerMarius Vlad <marius.vlad@collabora.com>
Wed, 15 Feb 2023 16:11:14 +0000 (18:11 +0200)
A hot-plug/re-plug event means we remove the black curtain with it the
ivi_surface that hangs out of it, so verify it before assuming there's
one installed.

Bug-AGL: SPEC-4705
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: Iad53ae34b4e15b5962cf984978a65c344aac9200

src/shell.c

index 15f911d..bcfb673 100644 (file)
@@ -1088,7 +1088,8 @@ create_black_curtain_view(struct ivi_output *output)
 bool
 output_has_black_curtain(struct ivi_output *output)
 {
-       return (output->fullscreen_view.fs->view &&
+       return (output->fullscreen_view.fs &&
+               output->fullscreen_view.fs->view &&
                output->fullscreen_view.fs->view->is_mapped &&
                output->fullscreen_view.fs->view->surface->is_mapped);
 }