diff options
| author |   nicm <nicm@openbsd.org> | 2019-06-20 06:51:36 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2019-06-20 06:51:36 +0000 |
| commit | e32e262ab56c8283645535af31c3e389bd20ff2b (patch) | |
| tree | 5c0bbd6f592d2acb3bd087786d071a2b5a14a56b /usr.bin/tmux/server.c | |
| parent | Work around locking issues in logwakeup(). Instead of actually waking up (diff) | |
| download | wireguard-openbsd-e32e262ab56c8283645535af31c3e389bd20ff2b.tar.xz wireguard-openbsd-e32e262ab56c8283645535af31c3e389bd20ff2b.zip | |
Expand command formats in %if and move the config file loading later (to
when the first client has identified) so all the client formats are
available, fixes problems reported by Thomas Sattler.
Diffstat (limited to 'usr.bin/tmux/server.c')
| -rw-r--r-- | usr.bin/tmux/server.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c index 7787954e0d3..9790bf0bb0b 100644 --- a/usr.bin/tmux/server.c +++ b/usr.bin/tmux/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.186 2019/06/07 20:09:17 nicm Exp $ */ +/* $OpenBSD: server.c,v 1.187 2019/06/20 06:51:36 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -208,8 +208,7 @@ server_start(struct tmuxproc *client, struct event_base *base, int lockfd, cmdq_append(c, cmdq_get_error(cause)); free(cause); c->flags |= CLIENT_EXIT; - } else - start_cfg(); + } server_add_accept(0); proc_loop(server_proc, server_loop); |