diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-05-31 13:00:11 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-05-31 13:00:11 +0100 |
| commit | 2ee9c4df12429d4f6fb8f06a373fdd5c0347049c (patch) | |
| tree | 1c241b4bcd2e637cbae11d7fb6b34840d9839ec7 /cmd-choose-tree.c | |
| parent | e6c77e7afbcee07ed6237f2a0f30e70f45ecf0ba (diff) | |
| parent | 76cb088d16fd5aa47b54428368ef403cbbcf4f5a (diff) | |
| download | rtmux-2ee9c4df12429d4f6fb8f06a373fdd5c0347049c.tar.gz rtmux-2ee9c4df12429d4f6fb8f06a373fdd5c0347049c.tar.bz2 rtmux-2ee9c4df12429d4f6fb8f06a373fdd5c0347049c.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'cmd-choose-tree.c')
| -rw-r--r-- | cmd-choose-tree.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c index e2d382b3..a9b6ffbc 100644 --- a/cmd-choose-tree.c +++ b/cmd-choose-tree.c @@ -89,10 +89,7 @@ cmd_choose_tree_exec(struct cmd *self, struct cmd_q *cmdq) return (CMD_RETURN_ERROR); } - if ((s = c->session) == NULL) - return (CMD_RETURN_ERROR); - - if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL) + if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL) return (CMD_RETURN_ERROR); if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0) @@ -231,9 +228,12 @@ windows_only: free(final_win_template_last); window_choose_ready(wl->window->active, cur_win, NULL); + window_choose_collapse_all(wl->window->active); - if (args_has(args, 'u')) + if (args_has(args, 'u')) { window_choose_expand_all(wl->window->active); + window_choose_set_current(wl->window->active, cur_win); + } return (CMD_RETURN_NORMAL); } |