[xine-cvs] HG: xine-lib-1.2: video_out_opengl2: fix X access deadlock

[Torsten J. <t....@gm...>]

# HG changeset patch
# User Torsten Jager <t....@gm...>
# Date 1342206445 -10800
# Node ID 9755e1cf8148c6179a69adf724177cd205e621c1
# Branch  default
# Parent  173fc24d9a78834201c30068c9228bdf0c7bac74
video_out_opengl2: fix X access deadlock

diff --git a/src/video_out/video_out_opengl2.c b/src/video_out/video_out_opengl2.c
--- a/src/video_out/video_out_opengl2.c
+++ b/src/video_out/video_out_opengl2.c
@@ -1221,9 +1221,11 @@
 
   opengl2_redraw_needed( this_gen );
 
+  XLockDisplay (this->display);
   pthread_mutex_lock(&this->drawable_lock); /* protect drawable from being changed */
   opengl2_draw( this, frame );
   pthread_mutex_unlock(&this->drawable_lock); /* allow changing drawable again */
+  XUnlockDisplay (this->display);
 
   frame->vo_frame.free( &frame->vo_frame );
 }