diff options
| author | Josh Rahm <rahm@google.com> | 2022-07-21 15:53:59 -0600 |
|---|---|---|
| committer | Josh Rahm <rahm@google.com> | 2022-07-21 15:53:59 -0600 |
| commit | b11548e3db4361cd8312ffbd27472823bdab4d62 (patch) | |
| tree | a84b5cf79fb41bb60b6495c1a346bb360b224604 /session.c | |
| parent | 88ebf5544e995d85b2f1416a216ac7f44f719eed (diff) | |
| parent | ab1d18d00febe161080b8e81331861481110809f (diff) | |
| download | rtmux-b11548e3db4361cd8312ffbd27472823bdab4d62.tar.gz rtmux-b11548e3db4361cd8312ffbd27472823bdab4d62.tar.bz2 rtmux-b11548e3db4361cd8312ffbd27472823bdab4d62.zip | |
Merge remote-tracking branch 'origin/master' into rahm
Diffstat (limited to 'session.c')
| -rw-r--r-- | session.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -27,7 +27,7 @@ #include "tmux.h" struct sessions sessions; -static u_int next_session_id; +u_int next_session_id; struct session_groups session_groups = RB_INITIALIZER(&session_groups); static void session_free(int, short, void *); @@ -501,7 +501,8 @@ session_set_current(struct session *s, struct winlink *wl) winlink_stack_push(&s->lastw, s->curw); s->curw = wl; if (options_get_number(global_options, "focus-events")) { - window_update_focus(old->window); + if (old != NULL) + window_update_focus(old->window); window_update_focus(wl->window); } winlink_clear_flags(wl); |