2 files changed, 12 insertions, 0 deletions
diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index 0e3b7790..f0be51c3 100644
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -485,6 +485,11 @@ gst_ximagesink_ximage_destroy (GstXImageSink * ximagesink,
     ximagesink->cur_image = NULL;
   }
 
+  /* We might have some buffers destroyed after changing state to NULL */
+  if (!ximagesink->xcontext) {
+    goto beach;
+  }
+
   g_mutex_lock (ximagesink->x_lock);
 
 #ifdef HAVE_XSHM
@@ -511,6 +516,7 @@ gst_ximagesink_ximage_destroy (GstXImageSink * ximagesink,
 
   g_mutex_unlock (ximagesink->x_lock);
 
+beach:
   if (ximage->ximagesink) {
     /* Release the ref to our sink */
     ximage->ximagesink = NULL;
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index 85d52ad7..b884849c 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -223,6 +223,11 @@ gst_xvimage_buffer_destroy (GstXvImageBuffer * xvimage)
   if (xvimagesink->cur_image == xvimage)
     xvimagesink->cur_image = NULL;
 
+  /* We might have some buffers destroyed after changing state to NULL */
+  if (xvimagesink->xcontext) {
+    goto beach;
+  }
+
   g_mutex_lock (xvimagesink->x_lock);
 
 #ifdef HAVE_XSHM
@@ -251,6 +256,7 @@ gst_xvimage_buffer_destroy (GstXvImageBuffer * xvimage)
 
   g_mutex_unlock (xvimagesink->x_lock);
 
+beach:
   xvimage->xvimagesink = NULL;
   gst_object_unref (xvimagesink);