summaryrefslogtreecommitdiffstats
path: root/libvo/vo_x11.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-31 03:03:12 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-31 03:03:12 +0000
commit2ba506f9088f11c86e09d9cc4baf633dfb7a73e6 (patch)
treee76bc025fa03531ff392aae58d73f8980725174e /libvo/vo_x11.c
parentddf20c18daceeeb7b93d9c658a04c8094e304b40 (diff)
downloadmpv-2ba506f9088f11c86e09d9cc4baf633dfb7a73e6.tar.bz2
mpv-2ba506f9088f11c86e09d9cc4baf633dfb7a73e6.tar.xz
fix uninit() crash if no config() call
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5415 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_x11.c')
-rw-r--r--libvo/vo_x11.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 0ca0fe1fa6..2e2d85e000 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -224,6 +224,7 @@ static void freeMyXImage()
{
XDestroyImage( myximage );
}
+ myximage=NULL;
}
static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d_height,uint32_t flags,char *title,uint32_t format,const vo_tune_info_t *info)
@@ -592,6 +593,8 @@ static uint32_t query_format( uint32_t format )
static void
uninit(void)
{
+ if(!myximage) return;
+
freeMyXImage();
saver_on(mDisplay); // screen saver back on