waylandsink: fail gracefully with an error message if we can't connect to wayland

g_return_val_if_fail() is not for error handling, it's for
catching programming errors in public API.

Fixes problem with generic/states unit test.

Conflicts:
	ext/wayland/gstwaylandsink.c

1 files changed, 12 insertions, 1 deletions

diff --git a/ext/wayland/gstwaylandsink.c b/ext/wayland/gstwaylandsink.c
index ccba10d68..a2016fddf 100644
--- a/ext/wayland/gstwaylandsink.c
+++ b/ext/wayland/gstwaylandsink.c
@@ -345,7 +345,11 @@ create_display (void)
 
   display = malloc (sizeof *display);
   display->display = wl_display_connect (NULL);
-  assert (display->display);
+
+  if (display->display == NULL) {
+    free (display);
+    return NULL;
+  }
 
   wl_display_add_global_listener (display->display,
       display_handle_global, display);
@@ -568,6 +572,13 @@ gst_wayland_sink_start (GstBaseSink * bsink)
   if (!sink->display)
     sink->display = create_display ();
 
+  if (sink->display == NULL) {
+    GST_ELEMENT_ERROR (bsink, RESOURCE, OPEN_READ_WRITE,
+        ("Could not initialise Wayland output"),
+        ("Could not create Wayland display"));
+    return FALSE;
+  }
+
   return result;
 }