From: Marius Vlad <marius.vlad@collabora.com>
Date: Tue, 6 Oct 2020 06:51:42 +0000 (+0300)
Subject: shell: Avoid creating and inserting black surface
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;ds=inline;h=54b89861c1c7331469b5f8c646a6cb79fb7ed73d;p=src%2Fagl-compositor.git

shell: Avoid creating and inserting black surface

Creating and inserting the black surface will require to have an
valid weston output. That might not be always the case so guard
against no output being set.

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

diff --git a/src/shell.c b/src/shell.c
index c884f16..21f321d 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -569,6 +569,9 @@ create_black_surface_view(struct ivi_output *output)
 	struct weston_compositor *wc= ivi->compositor;
 	struct weston_output *woutput = output->output;
 
+	if (!woutput)
+		return;
+
 	surface = weston_surface_create(wc);
 	view = weston_view_create(surface);
 
@@ -616,9 +619,9 @@ insert_black_surface(struct ivi_output *output)
 {
 	struct weston_view *view;
 
-	if (!output &&
+	if ((!output &&
 	    !output->fullscreen_view.fs &&
-	    !output->fullscreen_view.fs->view) {
+	    !output->fullscreen_view.fs->view) || !output->output) {
 		weston_log("Output %s doesn't have a surface installed!\n", output->name);
 		return;
 	}