From d644e5143fbce243ddcca468a1b8a1d5bfd21b34 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Fri, 22 Mar 2013 15:53:24 +0000
Subject: [PATCH] Fix so capture-pane/save-buffer can work in control clients,
 from George Nachman.

---
 cmd-save-buffer.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c
index b8f9968b..6031a562 100644
--- a/cmd-save-buffer.c
+++ b/cmd-save-buffer.c
@@ -45,7 +45,7 @@ enum cmd_retval
 cmd_save_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct args		*args = self->args;
-	struct client		*c = ctx->cmdclient;
+	struct client		*c;
 	struct session          *s;
 	struct paste_buffer	*pb;
 	const char		*path, *newpath, *wd;
@@ -76,13 +76,17 @@ cmd_save_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
 
 	path = args->argv[0];
 	if (strcmp(path, "-") == 0) {
+		c = ctx->curclient;
+		if (c == NULL || !(c->flags & CLIENT_CONTROL))
+			c = ctx->cmdclient;
 		if (c == NULL) {
-			ctx->error(ctx, "%s: can't write to stdout", path);
+			ctx->error(ctx, "can't write to stdout");
 			return (CMD_RETURN_ERROR);
 		}
 		evbuffer_add(c->stdout_data, pb->data, pb->size);
 		server_push_stdout(c);
 	} else {
+		c = ctx->cmdclient;
 		if (c != NULL)
 			wd = c->cwd;
 		else if ((s = cmd_current_session(ctx, 0)) != NULL) {