diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-10-13 08:09:47 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-10-13 08:09:47 +0100 |
| commit | 6551f4bb3b651aa2dba77a98cc42828737b88306 (patch) | |
| tree | 82dd6cbba583e9d4bc58a9334a8b74713d94da89 /server-client.c | |
| parent | 76a9e6f27bb0c7b547989c3b80cf8cc0a148064d (diff) | |
| parent | e0add119ea4a6c8d40905a7ad1f7bc3553d20ccc (diff) | |
| download | rtmux-6551f4bb3b651aa2dba77a98cc42828737b88306.tar.gz rtmux-6551f4bb3b651aa2dba77a98cc42828737b88306.tar.bz2 rtmux-6551f4bb3b651aa2dba77a98cc42828737b88306.zip | |
Merge branch 'obsd-master'
Conflicts:
paste.c
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/server-client.c b/server-client.c index 591033ce..5697e343 100644 --- a/server-client.c +++ b/server-client.c @@ -725,9 +725,10 @@ server_client_handle_key(struct client *c, key_code key) server_clear_identify(c, NULL); } if (c->prompt_string != NULL) { - if (!(c->flags & CLIENT_READONLY)) - status_prompt_key(c, key); - return; + if (c->flags & CLIENT_READONLY) + return; + if (status_prompt_key(c, key) == 0) + return; } /* Check for mouse keys. */ |