Skip to content

V
vlc-1.1
Commit 8463d728 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/video_output/x11/glx.c: don't call XCloseDisplay() if p_display == NULL.

parent 852f3863
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
modules/video_output/x11/glx.c
View file @ 8463d728
...@@ -185,7 +185,6 @@ static int CheckGLX( vlc_object_t *p_this, vlc_bool_t *b_glx13 ) ...@@ -185,7 +185,6 @@ static int CheckGLX( vlc_object_t *p_this, vlc_bool_t *b_glx13 )
if( !p_display ) if( !p_display )
{ {
msg_Err( p_this, "Cannot open display" ); msg_Err( p_this, "Cannot open display" );
XCloseDisplay( p_display );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -207,10 +206,7 @@ static int CheckGLX( vlc_object_t *p_this, vlc_bool_t *b_glx13 ) ...@@ -207,10 +206,7 @@ static int CheckGLX( vlc_object_t *p_this, vlc_bool_t *b_glx13 )
if (!glXQueryVersion( p_display, &i_maj, &i_min ) ) if (!glXQueryVersion( p_display, &i_maj, &i_min ) )
{ {
msg_Err( p_this, "glXQueryVersion failed" ); msg_Err( p_this, "glXQueryVersion failed" );
if( p_display != NULL ) XCloseDisplay( p_display );
{
XCloseDisplay( p_display );
}
return VLC_EGENERIC; return VLC_EGENERIC;
} }
if( i_maj <= 0 || ((i_maj == 1) && (i_min < 3)) ) if( i_maj <= 0 || ((i_maj == 1) && (i_min < 3)) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment