From 40cf66ac06246bc3815f8fc08229e32c5780a51b Mon Sep 17 00:00:00 2001 From: Torsten Jager Date: Fri, 13 Jul 2012 22:07:25 +0300 Subject: video_out_opengl2: fix X access deadlock --- src/video_out/video_out_opengl2.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/video_out/video_out_opengl2.c b/src/video_out/video_out_opengl2.c index 9ae0c5710..f281085b1 100644 --- a/src/video_out/video_out_opengl2.c +++ b/src/video_out/video_out_opengl2.c @@ -1221,9 +1221,11 @@ static void opengl2_display_frame( vo_driver_t *this_gen, vo_frame_t *frame_gen 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 ); } -- cgit v1.2.3