summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Waters <ystreet00@gmail.com>2014-02-28 17:42:51 +1100
committerMatthew Waters <ystreet00@gmail.com>2014-02-28 17:46:20 +1100
commitb31a34a22ed8504fe4b8e645c2d3ef2ba1e122eb (patch)
tree2c5acbb40cc9e6ab06b6a8ea4b79c93f4bba65be
parent8f64f9fb32fcd04428f90b83c68844bf58b85cff (diff)
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
-rw-r--r--gst-libs/gst/gl/gstglcontext.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/gst-libs/gst/gl/gstglcontext.c b/gst-libs/gst/gl/gstglcontext.c
index 1051d3b..f55c13f 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);