summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-09-20 10:26:22 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-09-20 10:26:22 +0000
commitd4e44fe64c7c665c0d5d2201b947ad0da6574cd3 (patch)
tree2a4e6e125504ca8dc43cccfc8667d524df74f9b3 /libvo
parentaf22e5a6ae056fce608b4743f41e14e2a1930454 (diff)
downloadmpv-d4e44fe64c7c665c0d5d2201b947ad0da6574cd3.tar.bz2
mpv-d4e44fe64c7c665c0d5d2201b947ad0da6574cd3.tar.xz
XDestroyWindow fix baze.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1925 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_x11.c6
-rw-r--r--libvo/vo_xmga.c4
-rw-r--r--libvo/vo_xv.c4
3 files changed, 10 insertions, 4 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index be6805c6de..3ab0c2ef6b 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -554,7 +554,10 @@ uninit(void)
#ifdef HAVE_NEW_GUI
if ( vo_window == None )
#endif
- saver_on(mDisplay); // screen saver back on
+ {
+ saver_on(mDisplay); // screen saver back on
+ XDestroyWindow( mDisplay,mywindow );
+ }
#ifdef HAVE_XF86VM
#ifdef HAVE_NEW_GUI
if ((vidmodes!=NULL)&&( vo_window == None ) )
@@ -568,7 +571,6 @@ uninit(void)
free(vidmodes);
}
#endif
- XDestroyWindow( mDisplay,mywindow );
printf("vo: uninit!\n");
}
diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c
index ad5912b568..f3eca823d9 100644
--- a/libvo/vo_xmga.c
+++ b/libvo/vo_xmga.c
@@ -346,8 +346,10 @@ uninit(void)
#ifdef HAVE_NEW_GUI
if ( vo_window == None )
#endif
+ {
saver_on(mDisplay);
+ XDestroyWindow( mDisplay,mWindow );
+ }
mga_uninit();
- XDestroyWindow( mDisplay,mWindow );
printf("vo: uninit!\n");
}
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index 032e72df37..fa1cdcd969 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -486,9 +486,11 @@ static void uninit(void)
#ifdef HAVE_NEW_GUI
if ( vo_window == None )
#endif
+ {
saver_on(mDisplay); // screen saver back on
+ XDestroyWindow( mDisplay,mywindow );
+ }
for( i=0;i<num_buffers;i++ ) deallocate_xvimage( i );
- XDestroyWindow( mDisplay,mywindow );
}