diff options
| -rw-r--r-- | usr.bin/tmux/server.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c index 963f2604219..f92a7d1c9b3 100644 --- a/usr.bin/tmux/server.c +++ b/usr.bin/tmux/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.26 2009/08/31 20:46:19 nicm Exp $ */ +/* $OpenBSD: server.c,v 1.27 2009/09/02 21:25:57 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -202,8 +202,8 @@ error: server_write_error(c, cause); xfree(cause); + sigterm = 1; server_shutdown(); - c->flags |= CLIENT_BAD; exit(server_main(srv_fd)); } @@ -304,7 +304,7 @@ server_main(int srv_fd) /* Update socket permissions. */ xtimeout = INFTIM; - if (sigterm || server_update_socket() != 0) + if (server_update_socket() != 0) xtimeout = POLL_TIMEOUT; /* Do the poll. */ @@ -420,7 +420,6 @@ server_shutdown(void) server_lost_client(c); else server_write_client(c, MSG_SHUTDOWN, NULL, 0); - c->flags |= CLIENT_BAD; } } } |