Mercurial > mplayer.hg
changeset 6077:754c2af16815
fixed vo_uninit
| author | alex |
|---|---|
| date | Mon, 13 May 2002 20:45:42 +0000 |
| parents | eff64fb1ffea |
| children | 4a9c7041141d |
| files | libvo/x11_common.c |
| diffstat | 1 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/x11_common.c Mon May 13 20:41:20 2002 +0000 +++ b/libvo/x11_common.c Mon May 13 20:45:42 2002 +0000 @@ -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 );