summaryrefslogtreecommitdiffstats
path: root/libvo/x11_common.c
diff options
context:
space:
mode:
authoralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-17 23:51:37 +0000
committeralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-17 23:51:37 +0000
commitc6eed70a1316fe7207c3b3ce5d8aa76360b13833 (patch)
tree4f644341d806c79eae0f5353f4cd787582034aa7 /libvo/x11_common.c
parent7562937d959ec617d4f78fd6d06aed7164b22255 (diff)
downloadmpv-c6eed70a1316fe7207c3b3ce5d8aa76360b13833.tar.bz2
mpv-c6eed70a1316fe7207c3b3ce5d8aa76360b13833.tar.xz
Workaround the bug in x11 vo's (if it's one) wich let a window in the way
even after vo->uninit(). Support for dvd/vobsub subtitles. No more crash if vo->config is not called before vo->uninit() git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6112 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/x11_common.c')
-rw-r--r--libvo/x11_common.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 564824130c..a572560e6c 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -60,7 +60,7 @@ static int dpms_disabled=0;
static int timeout_save=0;
char* mDisplayName=NULL;
-Display* mDisplay;
+Display* mDisplay=NULL;
Window mRootWin;
int mScreen;
int mLocalDisplay;
@@ -381,6 +381,7 @@ void vo_uninit( void )
XSetErrorHandler(NULL);
XCloseDisplay( mDisplay );
vo_depthonscreen = 0;
+ mDisplay=NULL;
}
#include "../linux/keycodes.h"