aboutsummaryrefslogtreecommitdiff
path: root/cmd-select-pane.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-04-22 00:01:11 +0100
committerThomas Adam <thomas@xteddy.org>2017-04-22 00:01:11 +0100
commit21240c1a8f89a4615b5bd8fa129618fb45c1c3cb (patch)
tree8af93abba6be1dd6f3eda69987361b614ae98223 /cmd-select-pane.c
parentfd13731049148d0205fa6ed1843041dad0573677 (diff)
parentc8ecbf38ab09d00920e97bd9363e16a1ebed0fa7 (diff)
downloadrtmux-21240c1a8f89a4615b5bd8fa129618fb45c1c3cb.tar.gz
rtmux-21240c1a8f89a4615b5bd8fa129618fb45c1c3cb.tar.bz2
rtmux-21240c1a8f89a4615b5bd8fa129618fb45c1c3cb.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-select-pane.c')
-rw-r--r--cmd-select-pane.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd-select-pane.c b/cmd-select-pane.c
index 6ef83473..7fc5d6ee 100644
--- a/cmd-select-pane.c
+++ b/cmd-select-pane.c
@@ -63,24 +63,24 @@ cmd_select_pane_exec(struct cmd *self, struct cmdq_item *item)
const char *style;
if (self->entry == &cmd_last_pane_entry || args_has(args, 'l')) {
- if (wl->window->last == NULL) {
+ lastwp = w->last;
+ if (lastwp == NULL) {
cmdq_error(item, "no last pane");
return (CMD_RETURN_ERROR);
}
if (args_has(self->args, 'e'))
- w->last->flags &= ~PANE_INPUTOFF;
+ lastwp->flags &= ~PANE_INPUTOFF;
else if (args_has(self->args, 'd'))
- w->last->flags |= PANE_INPUTOFF;
+ lastwp->flags |= PANE_INPUTOFF;
else {
server_unzoom_window(w);
- window_redraw_active_switch(w, w->last);
- if (window_set_active_pane(w, w->last)) {
+ window_redraw_active_switch(w, lastwp);
+ if (window_set_active_pane(w, lastwp)) {
server_status_window(w);
server_redraw_window_borders(w);
}
}
-
return (CMD_RETURN_NORMAL);
}