summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Waters <ystreet00@gmail.com>2014-02-24 23:55:58 +1100
committerMatthew Waters <ystreet00@gmail.com>2014-02-25 00:04:43 +1100
commit103235a8ed2efb6cd8a7e5f6ce1d5a9e9815975d (patch)
tree13eeab1d72d9f7f5ef4ffbbd8cfe093d75c62b94
parent4541809ed96fb72f554d0e6f8c87580c17e1f267 (diff)
x11: close both of the display's we use
(the comment doesn't seem to apply anymore) https://bugzilla.gnome.org/show_bug.cgi?id=725048
-rw-r--r--gst-libs/gst/gl/x11/gstglwindow_x11.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/gst-libs/gst/gl/x11/gstglwindow_x11.c b/gst-libs/gst/gl/x11/gstglwindow_x11.c
index 27c4fb2..0d68ed8 100644
--- a/gst-libs/gst/gl/x11/gstglwindow_x11.c
+++ b/gst-libs/gst/gl/x11/gstglwindow_x11.c
@@ -292,19 +292,9 @@ gst_gl_window_x11_close (GstGLWindow * window)
while (XPending (window_x11->device))
XNextEvent (window_x11->device, &event);
- /*XAddToSaveSet (display, w)
- Display *display;
- Window w; */
-
- //FIXME: it seems it causes destroy all created windows, even by other display connection:
- //This is case in: gst-launch-0.10 videotestsrc ! tee name=t t. ! queue ! glimagesink t. ! queue ! glimagesink
- //When the first window is closed and so its display is closed by the following line, then the other Window managed by the
- //other glimagesink, is not useable and so each opengl call causes a segmentation fault.
- //Maybe the solution is to use: XAddToSaveSet
- //The following line is commented to avoid the disagreement explained before.
- //XCloseDisplay (window_x11->device);
-
+ XCloseDisplay (window_x11->device);
GST_DEBUG ("display receiver closed");
+
XCloseDisplay (window_x11->disp_send);
GST_DEBUG ("display sender closed");
}