===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-swap-window.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -c -r1.26 -r1.27
*** src/usr.bin/tmux/cmd-swap-window.c	2020/04/13 08:26:27	1.26
--- src/usr.bin/tmux/cmd-swap-window.c	2020/04/13 10:59:58	1.27
***************
*** 1,4 ****
! /* $OpenBSD: cmd-swap-window.c,v 1.26 2020/04/13 08:26:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-swap-window.c,v 1.27 2020/04/13 10:59:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 46,65 ****
  cmd_swap_window_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args		*args = cmd_get_args(self);
! 	struct session		*src, *dst;
  	struct session_group	*sg_src, *sg_dst;
! 	struct winlink		*wl_src, *wl_dst;
  	struct window		*w_src, *w_dst;
  
- 	wl_src = item->source.wl;
- 	src = item->source.s;
  	sg_src = session_group_contains(src);
- 
- 	wl_dst = item->target.wl;
- 	dst = item->target.s;
  	sg_dst = session_group_contains(dst);
  
! 	if (src != dst && sg_src != NULL && sg_dst != NULL &&
  	    sg_src == sg_dst) {
  		cmdq_error(item, "can't move window, sessions are grouped");
  		return (CMD_RETURN_ERROR);
--- 46,64 ----
  cmd_swap_window_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 session		*src = source->s, *dst = target->s;
  	struct session_group	*sg_src, *sg_dst;
! 	struct winlink		*wl_src = source->wl, *wl_dst = target->wl;
  	struct window		*w_src, *w_dst;
  
  	sg_src = session_group_contains(src);
  	sg_dst = session_group_contains(dst);
  
! 	if (src != dst &&
! 	    sg_src != NULL &&
! 	    sg_dst != NULL &&
  	    sg_src == sg_dst) {
  		cmdq_error(item, "can't move window, sessions are grouped");
  		return (CMD_RETURN_ERROR);