Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2018-05-09 11:02:26 +01:00
commit 9e1093b7d7

View File

@ -1158,7 +1158,8 @@ cmd_find_target(struct cmd_find_state *fs, struct cmdq_item *item,
/* This will fill in winlink and window. */
if (cmd_find_get_window_with_session(fs, window) != 0)
goto no_window;
fs->wp = fs->wl->window->active;
if (fs->wl != NULL) /* can be NULL if index only */
fs->wp = fs->wl->window->active;
goto found;
}