frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: Ensure we wait for the server thread to terminate 

AKA: XQuartz 2.7.5 doesn't delete its /tmp/.X$d-lock

http://xquartz.macosforge.org/trac/ticket/823

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston Sequoia 2014-04-06 05:32:00 -07:00
parent 901fbfbbbd
commit ec6007e6f7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/xquartz/X11Controller.m
View File

@ -942,9 +942,8 @@ extern char *bundle_id_prefix;
/* shutdown the X server, it will exit () for us. */ /* shutdown the X server, it will exit () for us. */
DarwinSendDDXEvent(kXquartzQuit, 0); DarwinSendDDXEvent(kXquartzQuit, 0);
/* In case it doesn't, exit anyway after a while. */ /* In case it doesn't, exit anyway after 5s. */
remain = 10000000; [NSThread sleepForTimeInterval:5.0];
while ((remain = usleep(remain)) > 0) ;
exit(1); exit(1);
} }