Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv4265 Modified Files: x11_common.c Log Message: fixed vo_uninit Index: x11_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- x11_common.c 12 May 2002 22:16:31 -0000 1.81 +++ x11_common.c 13 May 2002 20:45:42 -0000 1.82 @@ -154,7 +154,7 @@ } #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 @@ 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 );