# HG changeset patch
# User alex
# Date 1021322742 0
# Node ID 754c2af1681548925ad1d6c71ac40249d4571a8c
# Parent  eff64fb1ffea06587d62b3c1a31f2554526de35e
fixed vo_uninit

diff -r eff64fb1ffea -r 754c2af16815 libvo/x11_common.c
--- 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 );