[xine-cvs] CVS: xine-ui/src/xitk/xine-toolkit image.c,1.39,1.40

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk/xine-toolkit
In directory usw-pr-cvs1:/tmp/cvs-serv19605/xine-toolkit

Modified Files:
	image.c 
Log Message:
destroy segment earlier.


Index: image.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/xine-toolkit/image.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- image.c	22 Aug 2002 23:18:41 -0000	1.39
+++ image.c	22 Aug 2002 23:35:27 -0000	1.40
@@ -158,7 +158,6 @@
 #ifdef HAVE_SHM
   if(xpix->shm) {
     shmdt(xpix->shminfo->shmaddr);
-    shmctl(xpix->shminfo->shmid, IPC_RMID, 0);
     free(xpix->shminfo);
   }
 #endif
@@ -210,7 +209,6 @@
     shminfo->readOnly = False;
     
     status = XShmAttach(im->x.disp, shminfo);
-    XSync(im->x.disp, False);
     if(status == 0) {
       XITK_WARNING("XShmAttach() failed (bad status).\n");
       XDestroyImage(xim);
@@ -222,6 +220,7 @@
     
     xpix->pixmap = XShmCreatePixmap(im->x.disp, im->x.base_window, 
 				    shminfo->shmaddr, shminfo, width, height, depth);
+    XSync(im->x.disp, False);
     if(!xpix->pixmap) {
       XITK_WARNING("XShmCreatePixmap() failed.\n");
       XDestroyImage(xim);
@@ -234,6 +233,7 @@
       xpix->shm = 1;
       XDestroyImage(xim);
       xpix->shminfo = shminfo;
+      shmctl(shminfo->shmid, IPC_RMID, 0);
     }
   }
   else