diff options
| author | Bastien Nocera <hadess@hadess.net> | 2013-03-26 11:42:11 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2013-03-26 11:42:11 +0100 |
| commit | b23c0c06bd1e2aff3ba1dbc92327529c08585c3d (patch) | |
| tree | e1d8d06bcd442ef35b46489d7770bcbf816eaa51 /clutter-gst/clutter-gst-playback.c | |
| parent | 760279744c611875b0a92f3cf7b84fb242ab1592 (diff) | |
| download | clutter-gst-b23c0c06bd1e2aff3ba1dbc92327529c08585c3d.tar.gz | |
playback: Fix X11 code running on non-X11 backends
Check that we're running in X11 before calling
clutter_x11_get_default_display() and using its result.
https://bugzilla.gnome.org/show_bug.cgi?id=681508
Diffstat (limited to 'clutter-gst/clutter-gst-playback.c')
| -rw-r--r-- | clutter-gst/clutter-gst-playback.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clutter-gst/clutter-gst-playback.c b/clutter-gst/clutter-gst-playback.c index 1b00615..a368de1 100644 --- a/clutter-gst/clutter-gst-playback.c +++ b/clutter-gst/clutter-gst-playback.c @@ -2029,8 +2029,9 @@ clutter_gst_playback_init (ClutterGstPlayback *self) self); #if defined(CLUTTER_WINDOWING_X11) && defined (HAVE_HW_DECODER_SUPPORT) - gst_bus_set_sync_handler (priv->bus, on_sync_message, - clutter_x11_get_default_display (), NULL); + if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) + gst_bus_set_sync_handler (priv->bus, on_sync_message, + clutter_x11_get_default_display (), NULL); #endif gst_object_unref (GST_OBJECT (priv->bus)); |