mirror of
https://github.com/mpv-player/mpv
synced 2024-12-11 17:37:23 +00:00
fixed vo_uninit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6078 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
6fe43d0d87
commit
bb0c81530d
@ -154,7 +154,7 @@ int vo_find_depth_from_visuals(Display *dpy, int screen, Visual **visual_return)
|
||||
}
|
||||
#endif
|
||||
|
||||
static void x11_errorhandler(Display *display, XErrorEvent *event)
|
||||
static int x11_errorhandler(Display *display, XErrorEvent *event)
|
||||
{
|
||||
#define MSGLEN 60
|
||||
char msg[MSGLEN];
|
||||
@ -369,7 +369,12 @@ int vo_init( void )
|
||||
|
||||
void vo_uninit( void )
|
||||
{
|
||||
if( !vo_depthonscreen ) return;
|
||||
if (!mDisplay)
|
||||
{
|
||||
mp_msg(MSGT_VO, MSGL_V, "vo: x11 uninit called but X11 not inited..\n");
|
||||
return;
|
||||
}
|
||||
// if( !vo_depthonscreen ) return;
|
||||
printf("vo: uninit ...\n" );
|
||||
XSetErrorHandler(NULL);
|
||||
XCloseDisplay( mDisplay );
|
||||
|
Loading…
Reference in New Issue
Block a user