===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- src/usr.bin/tmux/server.c	2019/05/20 11:46:06	1.185
+++ src/usr.bin/tmux/server.c	2019/06/07 20:09:17	1.186
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.185 2019/05/20 11:46:06 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.186 2019/06/07 20:09:17 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -44,7 +44,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;
 
@@ -208,11 +208,10 @@
 		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);