[Mplayer-cvslog] CVS: main/libvo x11_common.c,1.46,1.47

Alex Beregszaszi alex at mplayer.dev.hu
Thu Jan 31 12:26:32 CET 2002


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

Modified Files:
	x11_common.c 
Log Message:
grr, 10l. vo_x11_uninit: close display only if window not created by GUI

Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- x11_common.c	31 Jan 2002 11:15:54 -0000	1.46
+++ x11_common.c	31 Jan 2002 11:26:29 -0000	1.47
@@ -382,8 +382,6 @@
 
 int vo_x11_uninit(Display *display, Window window)
 {
-    XUnmapWindow(display, window);
-
 #ifdef HAVE_NEW_GUI
     /* destroy window only if it's not controlled by GUI */
     if (vo_window == None)
@@ -392,9 +390,8 @@
 	/* and -wid is set */
 	if (!(WinID > 0))
 	    XDestroyWindow(display, window);
+	XCloseDisplay(display);
     }
-
-    XCloseDisplay(display);
     return(1);
 }
 




More information about the MPlayer-cvslog mailing list