[Mplayer-cvslog] CVS: main/libvo vo_x11.c,1.30,1.31 vo_xmga.c,1.30,1.31 vo_xv.c,1.32,1.33

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv11933

Modified Files:
	vo_x11.c vo_xmga.c vo_xv.c 
Log Message:
XDestroyWindow fix baze.

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- vo_x11.c	18 Sep 2001 14:06:25 -0000	1.30
+++ vo_x11.c	20 Sep 2001 10:26:22 -0000	1.31
@@ -554,7 +554,10 @@
 #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 @@
           free(vidmodes);
         }
 #endif
- XDestroyWindow( mDisplay,mywindow );
 printf("vo: uninit!\n");
 }
 

Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- vo_xmga.c	18 Sep 2001 14:06:25 -0000	1.30
+++ vo_xmga.c	20 Sep 2001 10:26:22 -0000	1.31
@@ -346,8 +346,10 @@
 #ifdef HAVE_NEW_GUI
  if ( vo_window == None )
 #endif
+ {
   saver_on(mDisplay);
+  XDestroyWindow( mDisplay,mWindow );
+ }
  mga_uninit();
- XDestroyWindow( mDisplay,mWindow );
  printf("vo: uninit!\n");
 }

Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- vo_xv.c	18 Sep 2001 14:06:25 -0000	1.32
+++ vo_xv.c	20 Sep 2001 10:26:22 -0000	1.33
@@ -486,9 +486,11 @@
 #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 );
 }