From: Marius Vlad <marius.vlad@collabora.com>
Date: Wed, 15 Feb 2023 15:49:50 +0000 (+0200)
Subject: shell: Check for a valid ivi_surface
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=6678f58648dd18216620604eacf9c2172420c05a;p=src%2Fagl-compositor.git

shell: Check for a valid ivi_surface

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
(cherry picked from commit ee50083d93869aaa581a092c522efe08252fae55)
---

diff --git a/src/shell.c b/src/shell.c
index 15f911d..bcfb673 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -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);
 }