===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-swap-window.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/tmux/cmd-swap-window.c	2016/12/14 17:38:59	1.21
--- src/usr.bin/tmux/cmd-swap-window.c	2017/02/09 15:04:53	1.22
***************
*** 1,4 ****
! /* $OpenBSD: cmd-swap-window.c,v 1.21 2016/12/14 17:38:59 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-swap-window.c,v 1.22 2017/02/09 15:04:53 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 52,62 ****
  
  	wl_src = item->state.sflag.wl;
  	src = item->state.sflag.s;
! 	sg_src = session_group_find(src);
  
  	wl_dst = item->state.tflag.wl;
  	dst = item->state.tflag.s;
! 	sg_dst = session_group_find(dst);
  
  	if (src != dst && sg_src != NULL && sg_dst != NULL &&
  	    sg_src == sg_dst) {
--- 52,62 ----
  
  	wl_src = item->state.sflag.wl;
  	src = item->state.sflag.s;
! 	sg_src = session_group_contains(src);
  
  	wl_dst = item->state.tflag.wl;
  	dst = item->state.tflag.s;
! 	sg_dst = session_group_contains(dst);
  
  	if (src != dst && sg_src != NULL && sg_dst != NULL &&
  	    sg_src == sg_dst) {