diff options
| author | Keith Packard <keithp@keithp.com> | 2014-04-09 21:59:17 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-04-09 21:59:17 -0700 |
| commit | 3028ae6c9aa37168e249e0d847b29f8e3efb05b2 (patch) | |
| tree | ff22f6b6b5e3a60c1166a770bc290badbcf4e279 | |
| parent | bd3de10f86a511886b0748d55fa19860314a0150 (diff) | |
| parent | ec6007e6f7772a90713c9c51c64359229961ce27 (diff) | |
Merge remote-tracking branch 'jeremyhu/master'
| -rw-r--r-- | hw/xquartz/X11Controller.m | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m index 5445c6f3a..022e83258 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); } |