From 10470cea67eeb2ff34acbb37aac292bc6468ba07 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 5 Apr 2021 14:11:05 +0000
Subject: Move client-detached into server_client_lost so it is fired even if a
 client is closed unexpectedly.

---
 server-client.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'server-client.c')

diff --git a/server-client.c b/server-client.c
index adeea5dd..219fdf3a 100644
--- a/server-client.c
+++ b/server-client.c
@@ -299,6 +299,9 @@ server_client_lost(struct client *c)
 	TAILQ_REMOVE(&clients, c, entry);
 	log_debug("lost client %p", c);
 
+	if (c->flags & CLIENT_ATTACHED)
+		notify_client("client-detached", c);
+
 	if (c->flags & CLIENT_CONTROL)
 		control_stop(c);
 	if (c->flags & CLIENT_TERMINAL)
@@ -1769,9 +1772,6 @@ server_client_check_exit(struct client *c)
 		if (EVBUFFER_LENGTH(cf->buffer) != 0)
 			return;
 	}
-
-	if (c->flags & CLIENT_ATTACHED)
-		notify_client("client-detached", c);
 	c->flags |= CLIENT_EXITED;
 
 	switch (c->exit_type) {
-- 
cgit 


From e6abe55134df1b9dc3b7dd7f3a65dff272a35bb7 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 12 Apr 2021 09:36:12 +0000
Subject: Add a flag to disable keys to close a message, GitHub issue 2625.

---
 server-client.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'server-client.c')

diff --git a/server-client.c b/server-client.c
index 219fdf3a..25d61376 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1311,7 +1311,11 @@ server_client_handle_key(struct client *c, struct key_event *event)
 	 * immediately rather than queued.
 	 */
 	if (~c->flags & CLIENT_READONLY) {
-		status_message_clear(c);
+		if (c->message_string != NULL) {
+			if (c->message_ignore_keys)
+				return (0);
+			status_message_clear(c);
+		}
 		if (c->overlay_key != NULL) {
 			switch (c->overlay_key(c, event)) {
 			case 0:
-- 
cgit