xserver: Branch 'server-1.14-branch'
Matt Dew
marcoz at kemper.freedesktop.org
Mon Apr 14 18:16:05 PDT 2014
hw/xquartz/X11Controller.m | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit f665960c7aa6e4ebd7e927c1697339edc0ee88ef
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sun Apr 6 05:32:00 2014 -0700
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 at apple.com>
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 5445c6f..022e832 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -942,9 +942,8 @@ extern char *bundle_id_prefix;
/* shutdown the X server, it will exit () for us. */
DarwinSendDDXEvent(kXquartzQuit, 0);
- /* In case it doesn't, exit anyway after a while. */
- remain = 10000000;
- while ((remain = usleep(remain)) > 0) ;
+ /* In case it doesn't, exit anyway after 5s. */
+ [NSThread sleepForTimeInterval:5.0];
exit(1);
}
More information about the xorg-commit
mailing list