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

Merge remote-tracking branch 'jeremyhu/master'

This commit is contained in:
Keith Packard 2014-04-09 21:59:17 -07:00
parent bd3de10f86 ec6007e6f7
commit 3028ae6c9a
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);
} }