From f35f15b1077eea1d16037d2b226bf7fceb58b8fa Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 13 Jun 2019 21:44:13 +0000
Subject: Use the right client when working out where to save or load the
 buffer, reported by kn@.

---
 cmd-load-buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmd-load-buffer.c')

diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c
index 47cb0ca2..3e669093 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -93,7 +93,7 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
 		return (CMD_RETURN_WAIT);
 	}
 
-	file = server_client_get_path(c, path);
+	file = server_client_get_path(item->client, path);
 	free(path);
 
 	f = fopen(file, "rb");
-- 
cgit 


From 9272fe36e2e36789342337d81914008826499941 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 18 Jun 2019 11:08:42 +0000
Subject: Add a cmdq_continue function rather than twiddling the flag directly.

---
 cmd-load-buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmd-load-buffer.c')

diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c
index 3e669093..cdf44bf7 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -176,7 +176,7 @@ cmd_load_buffer_callback(struct client *c, int closed, void *data)
 		free(cause);
 	}
 out:
-	cdata->item->flags &= ~CMDQ_WAITING;
+	cmdq_continue(cdata->item);
 
 	free(cdata->bufname);
 	free(cdata);
-- 
cgit