aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--server.c4
-rw-r--r--tmux.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/server.c b/server.c
index 290ab8f0..29aed79f 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c,v 1.117 2009-02-08 16:11:26 nicm Exp $ */
+/* $Id: server.c,v 1.118 2009-02-08 16:26:43 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -151,7 +151,7 @@ server_start(const char *path)
* Must daemonise before loading configuration as the PID changes so
* $TMUX would be wrong for sessions created in the config file.
*/
- if (daemon(1, 0) != 0)
+ if (daemon(1, 1) != 0)
fatal("daemon failed");
ARRAY_INIT(&windows);
diff --git a/tmux.c b/tmux.c
index 14b317c5..96309fa1 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.105 2009-02-08 16:11:26 nicm Exp $ */
+/* $Id: tmux.c,v 1.106 2009-02-08 16:26:43 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -398,7 +398,7 @@ main(int argc, char **argv)
}
if (buffer_poll(&pfd, cctx.srv_in, cctx.srv_out) != 0)
- fatalx("lost server");
+ goto out;
restart:
if (BUFFER_USED(cctx.srv_in) < sizeof hdr)