Merge branch 'obsd-master'

1 files changed, 2 insertions, 13 deletions

diff --git a/server.c b/server.c
index 41bc492e..af966501 100644
--- a/server.c
+++ b/server.c
@@ -143,18 +143,6 @@ fail:
 	return (-1);
 }
 
-/* Server error callback. */
-static enum cmd_retval
-server_start_error(struct cmdq_item *item, void *data)
-{
-	char	*error = data;
-
-	cmdq_error(item, "%s", error);
-	free(error);
-
-	return (CMD_RETURN_NORMAL);
-}
-
 /* Fork new server. */
 int
 server_start(struct tmuxproc *client, struct event_base *base, int lockfd,
@@ -216,7 +204,8 @@ server_start(struct tmuxproc *client, struct event_base *base, int lockfd,
 	}
 
 	if (cause != NULL) {
-		cmdq_append(c, cmdq_get_callback(server_start_error, cause));
+		cmdq_append(c, cmdq_get_error(cause));
+		free(cause);
 		c->flags |= CLIENT_EXIT;
 	}