summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-05-23 02:27:58 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-05-23 02:32:37 -0700
commit7082929ef7db20b507dce5a8cec043e787d0b55e (patch)
tree6e7905c957ad143dbb2a6279b8cb3f75a697d30a
parent5a388b27a094c71b4214aa744b2ba0fdda7fd607 (diff)
XQuartz: A 2 second delay for launchd socket connections should be sufficient.
(cherry picked from commit 2bb4251b3c6b30dbf1a556e1b51e6f03f02d2529)
-rw-r--r--hw/xquartz/mach-startup/bundle-main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
index 73c0483ab..0068e02cb 100644
--- a/hw/xquartz/mach-startup/bundle-main.c
+++ b/hw/xquartz/mach-startup/bundle-main.c
@@ -437,8 +437,10 @@ int main(int argc, char **argv, char **envp) {
}
#else
void *add_launchd_display_thread(void *data) {
- /* TODO: Really fix this race */
- sleep(5);
+ /* TODO: Really fix this race... we want xinitrc to finish before connections
+ * are accepted on the launchd socket.
+ */
+ sleep(2);
/* Start listening on the launchd fd */
int launchd_fd = launchd_display_fd();