xserver: Branch 'master' - 2 commits
Keith Packard
keithp at kemper.freedesktop.org
Wed Apr 9 21:59:37 PDT 2014
hw/xquartz/X11Controller.m | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 3028ae6c9aa37168e249e0d847b29f8e3efb05b2
Merge: bd3de10 ec6007e
Author: Keith Packard <keithp at keithp.com>
Date: Wed Apr 9 21:59:17 2014 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit ec6007e6f7772a90713c9c51c64359229961ce27
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