diff options
| author | Darren Salt <devspam@moreofthesa.me.uk> | 2013-09-04 16:25:53 +0100 |
|---|---|---|
| committer | Darren Salt <devspam@moreofthesa.me.uk> | 2013-09-04 16:25:53 +0100 |
| commit | b196a6012ace0ce8636412cf3a439df1a170e797 (patch) | |
| tree | a9eafe15ffddc480ed4fbaf8a47046e31e7447b7 /src/video_out/video_out_opengl2.c | |
| parent | 7e1e415976f2feeed1f055baf64dcf574488dc66 (diff) | |
| parent | d08771bdead811e8ccebe6ec6d93a4ededd10300 (diff) | |
| download | xine-lib-b196a6012ace0ce8636412cf3a439df1a170e797.tar.gz xine-lib-b196a6012ace0ce8636412cf3a439df1a170e797.tar.bz2 | |
Merge.
Diffstat (limited to 'src/video_out/video_out_opengl2.c')
| -rw-r--r-- | src/video_out/video_out_opengl2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/video_out/video_out_opengl2.c b/src/video_out/video_out_opengl2.c index fed693af0..aadfca107 100644 --- a/src/video_out/video_out_opengl2.c +++ b/src/video_out/video_out_opengl2.c @@ -1158,7 +1158,10 @@ static void opengl2_draw_video_bilinear( opengl2_driver_t *that, int guiw, int g static void opengl2_draw( opengl2_driver_t *that, opengl2_frame_t *frame ) { - glXMakeCurrent( that->display, that->drawable, that->context ); + if ( !glXMakeCurrent( that->display, that->drawable, that->context ) ) { + xprintf( that->xine, XINE_VERBOSITY_LOG, "video_out_opengl2: display unavailable for rendering\n" ); + return; + } if ( !opengl2_check_textures_size( that, frame->width, frame->height ) ) { glXMakeCurrent( that->display, None, NULL ); |