[Mplayer-cvslog] CVS: main/libvo vo_xmga.c,1.53,1.54

[Arpi of Ize]

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

Modified Files:
	vo_xmga.c 
Log Message:
uninit bugs fixed

Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- vo_xmga.c	9 Mar 2002 21:53:03 -0000	1.53
+++ vo_xmga.c	17 Mar 2002 03:38:16 -0000	1.54
@@ -185,6 +185,8 @@
    vo_mga_flip_page();
 }
 
+static int inited=0;
+
 static uint32_t config( uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t* info)
 {
  char                 * frame_mem;
@@ -266,6 +268,8 @@
    default: printf( "Sorry, this (%d) color depth not supported.\n",vo_depthonscreen ); return -1;
   }
 
+  inited=1;
+
   aspect(&d_width,&d_height,A_NOZOOM);
 #ifdef HAVE_NEW_GUI
  if ( vo_window == None )
@@ -349,14 +353,11 @@
 static void
 uninit(void)
 {
- saver_on(mDisplay);
-#ifdef HAVE_NEW_GUI
- if ( vo_window == None )
-#endif
- {
-  XDestroyWindow( mDisplay,vo_window );
- }
+ if(!inited) return;
+ inited=0;
  mga_uninit();
+ saver_on(mDisplay);
+ vo_x11_uninit(mDisplay, vo_window);
  printf("vo: uninit!\n");
 }