mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-13 02:45:35 +00:00
Code Issues 1 Projects Releases Wiki Activity

[825/906] glwindow_x11: check if the loop exists

Browse source 
It happens when calling set_window_handle before to reach GST_STATE_READY.
In this case the parent is set when creating the internal window.
This commit is contained in:
Julien Isorce 2013-10-11 16:00:23 +01:00 committed by Tim-Philipp Müller
parent 266ffc48be
commit 0da88c6516
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst-libs/gst/gl/x11/gstglwindow_x11.c
View file

@ -355,7 +355,8 @@ gst_gl_window_x11_close (GstGLWindow * window)
g_source_unref (window_x11->x11_source);
window_x11->x11_source = NULL;
g_main_loop_unref (window_x11->loop);
window_x11->loop = NULL, g_main_context_unref (window_x11->main_context);
window_x11->loop = NULL;
g_main_context_unref (window_x11->main_context);
window_x11->main_context = NULL;
window_x11->running = FALSE;
@ -414,7 +415,11 @@ gst_gl_window_x11_set_window_handle (GstGLWindow * window, guintptr id)
window_x11->parent_win = (Window) id;
if (g_main_loop_is_running (window_x11->loop)) {
/* The loop may not exist yet because it's created in GstGLWindow::open
* which is only called when going from READY to PAUSED state.
* If no loop then the parent is directly set in XCreateWindow
*/
if (window_x11->loop && g_main_loop_is_running (window_x11->loop)) {
GST_LOG ("set parent window id: %lud", id);
g_mutex_lock (&window_x11->disp_send_lock);