summaryrefslogtreecommitdiffstats
path: root/server-client.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2019-03-25 15:57:47 +0000
committerThomas Adam <thomas@xteddy.org>2019-03-25 15:57:47 +0000
commita07ad6b5a3cab6ef376797421306baf1991dc912 (patch)
tree21e89b7e22c6c372e7e6e762bfc5d00d91c28af8 /server-client.c
parente8f4ca6a52bdfb7d8e2b8c39b867f2e2528a7631 (diff)
parent517d673dbe4b7b5ab290203868d871a712624446 (diff)
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/server-client.c b/server-client.c
index a233a91d..932ef460 100644
--- a/server-client.c
+++ b/server-client.c
@@ -504,14 +504,13 @@ have_event:
m->statusat = status_at_line(c);
if (m->statusat != -1 &&
y >= (u_int)m->statusat &&
- y < m->statusat + status_line_size(c))
+ y < m->statusat + status_line_size(c)) {
sr = status_get_range(c, x, y - m->statusat);
- else
- sr = NULL;
- if (sr != NULL) {
+ if (sr == NULL)
+ return (KEYC_UNKNOWN);
switch (sr->type) {
case STYLE_RANGE_NONE:
- break;
+ return (KEYC_UNKNOWN);
case STYLE_RANGE_LEFT:
where = STATUS_LEFT;
break;
@@ -520,10 +519,11 @@ have_event:
break;
case STYLE_RANGE_WINDOW:
wl = winlink_find_by_index(&s->windows, sr->argument);
- if (wl != NULL) {
- m->w = wl->window->id;
- where = STATUS;
- }
+ if (wl == NULL)
+ return (KEYC_UNKNOWN);
+ m->w = wl->window->id;
+
+ where = STATUS;
break;
}
}