diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-13 20:45:42 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-13 20:45:42 +0000 |
| commit | bb0c81530d76e51f78f71d6bfb0711b76dcf1145 (patch) | |
| tree | 06f70956fb44652e021657d44808a8a2eeee5e1e /libvo | |
| parent | 6fe43d0d87ecf783635b932afb7261153e65a86b (diff) | |
| download | mpv-bb0c81530d76e51f78f71d6bfb0711b76dcf1145.tar.bz2 mpv-bb0c81530d76e51f78f71d6bfb0711b76dcf1145.tar.xz | |
fixed vo_uninit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6078 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/x11_common.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 9cc0644b1a..5b09716ae4 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -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 ); |