From cb1131a29481246c9cb9b68cb8591cc747fcdd9a Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sat, 2 May 2020 15:15:52 +0100 Subject: menu_mode_cb needs to return a screen also. --- server-client.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'server-client.c') diff --git a/server-client.c b/server-client.c index 23435b48..a9762c56 100644 --- a/server-client.c +++ b/server-client.c @@ -1540,7 +1540,7 @@ server_client_reset_state(struct client *c) struct tty *tty = &c->tty; struct window *w = c->session->curw->window; struct window_pane *wp = w->active, *loop; - struct screen *s; + struct screen *s = NULL; struct options *oo = c->session->options; int mode = 0, cursor, flags; u_int cx = 0, cy = 0, ox, oy, sx, sy; @@ -1553,9 +1553,10 @@ server_client_reset_state(struct client *c) tty->flags &= ~TTY_BLOCK; /* Get mode from overlay if any, else from screen. */ - if (c->overlay_draw != NULL && c->overlay_mode != NULL) - s = c->overlay_mode(c, &cx, &cy); - else + if (c->overlay_draw != NULL) { + if (c->overlay_mode != NULL) + s = c->overlay_mode(c, &cx, &cy); + } else s = wp->screen; if (s != NULL) mode = s->mode; -- cgit