diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-01-16 19:17:31 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-01-16 19:17:31 +0000 |
| commit | df6488a47088ec8bcddc6a1cfa85fec1a462c789 (patch) | |
| tree | cf1bbe106963c4f0201a2edc24f8bc416f74c0ca /window-choose.c | |
| parent | 66e8811c64a833b759511b3f7309e834155a8442 (diff) | |
| parent | 776eef49d8e13b227d25e5d56d4c379b89c4aacb (diff) | |
| download | rtmux-df6488a47088ec8bcddc6a1cfa85fec1a462c789.tar.gz rtmux-df6488a47088ec8bcddc6a1cfa85fec1a462c789.tar.bz2 rtmux-df6488a47088ec8bcddc6a1cfa85fec1a462c789.zip | |
Merge branch 'obsd-master'
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 |