diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-01-25 20:31:22 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-01-25 20:31:22 +0000 |
| commit | 51233d8b2a8509405856439f11e7a60d08da8335 (patch) | |
| tree | d02084aa6aa33ef415f343e809eefb1326613b13 /window-choose.c | |
| parent | 68429cd0d3ebfa0a721814b097f03d95d532580c (diff) | |
| parent | df6488a47088ec8bcddc6a1cfa85fec1a462c789 (diff) | |
| download | rtmux-51233d8b2a8509405856439f11e7a60d08da8335.tar.gz rtmux-51233d8b2a8509405856439f11e7a60d08da8335.tar.bz2 rtmux-51233d8b2a8509405856439f11e7a60d08da8335.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'window-choose.c')
| -rw-r--r-- | window-choose.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/window-choose.c b/window-choose.c index 56016394..0d724746 100644 --- a/window-choose.c +++ b/window-choose.c @@ -330,14 +330,12 @@ window_choose_collapse(struct window_pane *wp, struct session *s) struct window_choose_mode_data *data = wp->modedata; struct window_choose_mode_item *item, *chosen; struct window_choose_data *wcd; - u_int i, pos; + u_int i; ARRAY_DECL(, struct window_choose_mode_item) list_copy; ARRAY_INIT(&list_copy); - pos = data->selected; - - chosen = &ARRAY_ITEM(&data->list, pos); + chosen = &ARRAY_ITEM(&data->list, data->selected); chosen->state &= ~TREE_EXPANDED; /* @@ -353,9 +351,8 @@ window_choose_collapse(struct window_pane *wp, struct session *s) /* We only show the session when collapsed. */ if (wcd->type & TREE_SESSION) { item->state &= ~TREE_EXPANDED; + ARRAY_ADD(&list_copy, *item); - ARRAY_ADD(&list_copy, - ARRAY_ITEM(&data->list, i)); /* * Update the selection to this session item so * we don't end up highlighting a non-existent |