aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2021-04-12 12:01:32 +0100
committerThomas Adam <thomas@xteddy.org>2021-04-12 12:01:32 +0100
commitbedf2bd4372c60a525c22e6309f329cfd0bd07bc (patch)
treea0b3c4c57781899c1c3d74c12a11a10f69fb7682 /server-client.c
parent83cd593b9cce8bbdfd8014e13393ec1f1ec90f2e (diff)
parente6abe55134df1b9dc3b7dd7f3a65dff272a35bb7 (diff)
downloadrtmux-bedf2bd4372c60a525c22e6309f329cfd0bd07bc.tar.gz
rtmux-bedf2bd4372c60a525c22e6309f329cfd0bd07bc.tar.bz2
rtmux-bedf2bd4372c60a525c22e6309f329cfd0bd07bc.zip
Merge branch 'obsd-master' into master
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/server-client.c b/server-client.c
index 1c2b74b6..d3ffd682 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1308,7 +1308,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: