diff options
| -rw-r--r-- | cmd-find.c | 11 | ||||
| -rw-r--r-- | cmd-new-window.c | 2 |
2 files changed, 7 insertions, 6 deletions
@@ -437,15 +437,15 @@ cmd_find_get_window_with_session(struct cmd_find_state *fs, const char *window) if (window[0] != '+' && window[0] != '-') { idx = strtonum(window, 0, INT_MAX, &errstr); if (errstr == NULL) { - if (fs->flags & CMD_FIND_WINDOW_INDEX) { - fs->idx = idx; - return (0); - } fs->wl = winlink_find_by_index(&fs->s->windows, idx); if (fs->wl != NULL) { fs->w = fs->wl->window; return (0); } + if (fs->flags & CMD_FIND_WINDOW_INDEX) { + fs->idx = idx; + return (0); + } } } @@ -1182,7 +1182,8 @@ cmd_find_target(struct cmd_find_state *fs, struct cmdq_item *item, /* This will fill in session, winlink and window. */ if (cmd_find_get_window(fs, window, window_only) != 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; } diff --git a/cmd-new-window.c b/cmd-new-window.c index 4c9878ed..6517e99e 100644 --- a/cmd-new-window.c +++ b/cmd-new-window.c @@ -63,7 +63,7 @@ cmd_new_window_exec(struct cmd *self, struct cmdq_item *item) struct environ_entry *envent; struct cmd_find_state fs; - if (args_has(args, 'a')) { + if (args_has(args, 'a') && wl != NULL) { if ((idx = winlink_shuffle_up(s, wl)) == -1) { cmdq_error(item, "no free window indexes"); return (CMD_RETURN_ERROR); |