===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-swap-pane.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -c -r1.36 -r1.37
*** src/usr.bin/tmux/cmd-swap-pane.c	2020/04/13 08:26:27	1.36
--- src/usr.bin/tmux/cmd-swap-pane.c	2020/04/13 10:59:58	1.37
***************
*** 1,4 ****
! /* $OpenBSD: cmd-swap-pane.c,v 1.36 2020/04/13 08:26:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-swap-pane.c,v 1.37 2020/04/13 10:59:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 46,60 ****
  cmd_swap_pane_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args		*args = cmd_get_args(self);
  	struct window		*src_w, *dst_w;
  	struct window_pane	*tmp_wp, *src_wp, *dst_wp;
  	struct layout_cell	*src_lc, *dst_lc;
  	u_int			 sx, sy, xoff, yoff;
  
! 	dst_w = item->target.wl->window;
! 	dst_wp = item->target.wp;
! 	src_w = item->source.wl->window;
! 	src_wp = item->source.wp;
  
  	if (window_push_zoom(dst_w, args_has(args, 'Z')))
  		server_redraw_window(dst_w);
--- 46,62 ----
  cmd_swap_pane_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args		*args = cmd_get_args(self);
+ 	struct cmd_find_state	*source = cmdq_get_source(item);
+ 	struct cmd_find_state	*target = cmdq_get_target(item);
  	struct window		*src_w, *dst_w;
  	struct window_pane	*tmp_wp, *src_wp, *dst_wp;
  	struct layout_cell	*src_lc, *dst_lc;
  	u_int			 sx, sy, xoff, yoff;
  
! 	dst_w = target->wl->window;
! 	dst_wp = target->wp;
! 	src_w = source->wl->window;
! 	src_wp = source->wp;
  
  	if (window_push_zoom(dst_w, args_has(args, 'Z')))
  		server_redraw_window(dst_w);