circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-06 11:46:06 +00:00
Code Issues Projects Releases Wiki Activity

menu_mode_cb needs to return a screen also.

Browse Source
This commit is contained in:
Nicholas Marriott
2020-05-02 15:15:52 +01:00
parent e078f975c5
commit cb1131a294
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server-client.c
View File

@@ -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;