circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-01 20:57:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2019-06-07 23:02:26 +01:00
parent c91680822d e37f34facc
commit e13c1e5320
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server.c
View File

@ -43,7 +43,7 @@
struct clients clients;
struct tmuxproc *server_proc;
static int server_fd;
static int server_fd = -1;
static int server_exit;
static struct event server_ev_accept;
@ -207,11 +207,10 @@ 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();
start_cfg();
server_add_accept(0);
proc_loop(server_proc, server_loop);
job_kill_all();
@ -363,6 +362,9 @@ server_add_accept(int timeout)
{
struct timeval tv = { timeout, 0 };
if (server_fd == -1)
return;
if (event_initialized(&server_ev_accept))
event_del(&server_ev_accept);