aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2011-05-18 20:32:04 +0000
committerTiago Cunha <tcunha@gmx.com>2011-05-18 20:32:04 +0000
commit13d5ac6f9efac856623a7b9ea74e0d3a919ec2f9 (patch)
treea3e6137169ef458446b5ae006fee188c8e733100
parent1e7cea407de16b493fa95a7e6f52cb135378cc85 (diff)
downloadrtmux-13d5ac6f9efac856623a7b9ea74e0d3a919ec2f9.tar.gz
rtmux-13d5ac6f9efac856623a7b9ea74e0d3a919ec2f9.tar.bz2
rtmux-13d5ac6f9efac856623a7b9ea74e0d3a919ec2f9.zip
Sync OpenBSD patchset 909:
Reset last pane on swap-pane across windows, fixes crash noticed by hsim at gmx.li.
-rw-r--r--cmd-swap-pane.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index d5a68ee6..d7ab6cf5 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-swap-pane.c,v 1.16 2011-01-07 14:45:34 tcunha Exp $ */
+/* $Id: cmd-swap-pane.c,v 1.17 2011-05-18 20:32:04 tcunha Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -129,6 +129,12 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
if (dst_w->active == dst_wp)
window_set_active_pane(dst_w, src_wp);
}
+ if (src_w != dst_w) {
+ if (src_w->last == src_wp)
+ src_w->last = NULL;
+ if (dst_w->last == dst_wp)
+ dst_w->last = NULL;
+ }
server_redraw_window(src_w);
server_redraw_window(dst_w);