From 64950f4524c2937267c3ae73c410f1ce7eb015b7 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sun, 16 Aug 2009 19:07:40 +0000 Subject: [PATCH] Sync OpenBSD patchset 255: Rather than telling the client to exit in the function when creating a new session detached, let the caller do it. Allows "tmux new -d \; attach" to work. --- cmd-new-session.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cmd-new-session.c b/cmd-new-session.c index dbb7d117..6324030f 100644 --- a/cmd-new-session.c +++ b/cmd-new-session.c @@ -1,4 +1,4 @@ -/* $Id: cmd-new-session.c,v 1.53 2009-08-16 19:04:05 tcunha Exp $ */ +/* $Id: cmd-new-session.c,v 1.54 2009-08-16 19:07:40 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -240,8 +240,6 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx) if (ctx->cmdclient != NULL) { if (!detached) server_write_client(ctx->cmdclient, MSG_READY, NULL, 0); - else - server_write_client(ctx->cmdclient, MSG_EXIT, NULL, 0); } /* Set the client to the new session. */ @@ -256,7 +254,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx) } recalculate_sizes(); - return (1); /* 1 means don't tell command client to exit */ + return (!detached); /* 1 means don't tell command client to exit */ } void