X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fshell.c;h=ac41e1fa28213aa10cd5605ca8484d27e175e8da;hb=9aa06a04b36d5d962f3b1cc8b6a541f8e73f6278;hp=6944f8a254543e1e17c69ee56745060e4dbf9143;hpb=fd6c5fed808b962318ec655f065e7e378983e8f8;p=src%2Fagl-compositor.git

diff --git a/src/shell.c b/src/shell.c
index 6944f8a..ac41e1f 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -186,7 +186,7 @@ ivi_set_pending_desktop_surface_split(struct ivi_output *ioutput,
 	wl_list_insert(&ivi->split_pending_apps, &split->link);
 }
 
-static void
+void
 ivi_set_pending_desktop_surface_remote(struct ivi_output *ioutput,
 		const char *app_id)
 {
@@ -559,8 +559,16 @@ create_black_surface_view(struct ivi_output *output)
 void
 remove_black_surface(struct ivi_output *output)
 {
-	struct weston_view *view = output->fullscreen_view.fs->view;
+	struct weston_view *view;
+
+	if (!output &&
+	    !output->fullscreen_view.fs &&
+	    !output->fullscreen_view.fs->view) {
+		weston_log("Output %s doesn't have a surface installed!\n", output->name);
+		return;
+	}
 
+	view = output->fullscreen_view.fs->view;
 	assert(view->is_mapped == true ||
 	       view->surface->is_mapped == true);
 
@@ -576,8 +584,16 @@ remove_black_surface(struct ivi_output *output)
 void
 insert_black_surface(struct ivi_output *output)
 {
-	struct weston_view *view = output->fullscreen_view.fs->view;
+	struct weston_view *view;
+
+	if (!output &&
+	    !output->fullscreen_view.fs &&
+	    !output->fullscreen_view.fs->view) {
+		weston_log("Output %s doesn't have a surface installed!\n", output->name);
+		return;
+	}
 
+	view = output->fullscreen_view.fs->view;
 	if (view->is_mapped || view->surface->is_mapped)
 		return;