circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-26 07:58:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2020-10-29 14:05:21 +00:00
commit d5fac75667
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server-client.c
View File

@ -2245,7 +2245,7 @@ server_client_dispatch_identify(struct client *c, struct imsg *imsg)
c->fd = open(c->ttyname, O_RDWR|O_NOCTTY); c->fd = open(c->ttyname, O_RDWR|O_NOCTTY);
#endif #endif
if (c->flags & CLIENT_CONTROL) if (c->flags & CLIENT_CONTROL)
control_start(c); control_start(c);
else if (c->fd != -1) { else if (c->fd != -1) {
if (tty_init(&c->tty, c) != 0) { if (tty_init(&c->tty, c) != 0) {
@ -2260,13 +2260,13 @@ server_client_dispatch_identify(struct client *c, struct imsg *imsg)
} }
/* /*
* If this is the first client that has finished identifying, load * If this is the first client, load configuration files. Any later
* configuration files. * clients are allowed to continue with their command even if the
* config has not been loaded - they might have been run from inside it
*/ */
if ((~c->flags & CLIENT_EXIT) && if ((~c->flags & CLIENT_EXIT) &&
!cfg_finished && !cfg_finished &&
c == TAILQ_FIRST(&clients) && c == TAILQ_FIRST(&clients))
TAILQ_NEXT(c, entry) == NULL)
start_cfg(); start_cfg();
} }