===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-swap-window.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- src/usr.bin/tmux/cmd-swap-window.c	2016/10/10 21:51:39	1.17
+++ src/usr.bin/tmux/cmd-swap-window.c	2016/10/13 10:01:49	1.18
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-swap-window.c,v 1.17 2016/10/10 21:51:39 nicm Exp $ */
+/* $OpenBSD: cmd-swap-window.c,v 1.18 2016/10/13 10:01:49 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -83,6 +83,13 @@
 		server_redraw_session_group(dst);
 	}
 	recalculate_sizes();
+
+	cmd_find_clear_state(&cmdq->current, NULL, 0);
+	cmdq->current.s = dst;
+	cmdq->current.wl = wl_dst;
+	cmdq->current.w = wl_dst->window;
+	cmdq->current.wp = cmdq->state.sflag.wp;
+	cmd_find_log_state(__func__, &cmdq->current);
 
 	return (CMD_RETURN_NORMAL);
 }