X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;fp=src%2Fdesktop.c;h=479174dae32cb7058591194012200568518ee195;hb=9827cfd255780640650f7c9667daa7802dc1bb34;hp=00cc4db9ac1a31815a3bd45fd7cfaf8e17b836b6;hpb=06773d6abdc06e0d887729da39259524bd772c44;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index 00cc4db..479174d 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -137,6 +137,12 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
 		weston_desktop_surface_get_surface(dsurface);
 
 	struct ivi_output *output = ivi_layout_get_output_from_surface(surface);
+
+	/* special corner-case, pending_surfaces which are never activated or
+	 * being assigned an output might land here so just remove the surface */
+	if (output == NULL && surface->role == IVI_SURFACE_ROLE_NONE)
+		goto skip_output_asignment;
+
 	assert(output != NULL);
 
 	/* resize the active surface to the original size */
@@ -199,6 +205,7 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
 		output->background = NULL;
 	}
 
+skip_output_asignment:
 	weston_log("Removed surface %p, app_id %s, role %s\n", surface,
 			weston_desktop_surface_get_app_id(dsurface),
 			ivi_layout_get_surface_role_name(surface));