From 8b4503aa6faea2c22b860e010e9d7bc1fe46f2e1 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Fri, 28 Feb 2014 17:42:51 +1100 Subject: [PATCH] [895/906] context: call window_class->close last We should destroy resources before closing the display connection Fixes https://bugzilla.gnome.org/show_bug.cgi?id=725048 --- gst-libs/gst/gl/gstglcontext.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gst-libs/gst/gl/gstglcontext.c b/gst-libs/gst/gl/gstglcontext.c index 1051d3bc27..f55c13f7b1 100644 --- a/gst-libs/gst/gl/gstglcontext.c +++ b/gst-libs/gst/gl/gstglcontext.c @@ -792,17 +792,19 @@ gst_gl_context_create_thread (GstGLContext * context) context->priv->alive = FALSE; - if (window_class->close) { - window_class->close (context->window); - } - context_class->activate (context, FALSE); context_class->destroy_context (context); + /* User supplied callback */ if (context->window->close) context->window->close (context->window->close_data); + /* window specific shutdown */ + if (window_class->close) { + window_class->close (context->window); + } + g_cond_signal (&context->priv->destroy_cond); g_mutex_unlock (&context->priv->render_lock);