mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstglwindow: initialize navigation_loop to NULL

Browse source 
Useful when gst_gl_window.c::gst_gl_window_new is not used.
This is the case when using a custom GstGLWindow.
(ex: GstGLWindowGPUProcess from Chromium)
This commit is contained in:
Julien Isorce 2016-02-01 12:23:32 +00:00 committed by Tim-Philipp Müller
parent a0d62ce32c
commit f2cfa7fb51
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst-libs/gst/gl/gstglwindow.c
View file

@ -199,6 +199,7 @@ gst_gl_window_init (GstGLWindow * window)
priv->main_context = g_main_context_new (); priv->main_context = g_main_context_new ();
priv->loop = g_main_loop_new (priv->main_context, FALSE); priv->loop = g_main_loop_new (priv->main_context, FALSE);
priv->navigation_loop = NULL;
} }
static void static void
@ -329,10 +330,12 @@ gst_gl_window_finalize (GObject * object)
GstGLWindowPrivate *priv = window->priv; GstGLWindowPrivate *priv = window->priv;
GST_INFO ("quit navigation loop"); GST_INFO ("quit navigation loop");
g_main_loop_quit (window->priv->navigation_loop); if (window->priv->navigation_loop) {
/* wait until navigation thread finished */ g_main_loop_quit (window->priv->navigation_loop);
g_thread_join (window->priv->navigation_thread); /* wait until navigation thread finished */
window->priv->navigation_thread = NULL; g_thread_join (window->priv->navigation_thread);
window->priv->navigation_thread = NULL;
}
if (priv->loop) if (priv->loop)
g_main_loop_unref (priv->loop); g_main_loop_unref (priv->loop);