===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-switch-client.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -c -r1.44 -r1.45
*** src/usr.bin/tmux/cmd-switch-client.c	2016/10/16 19:04:05	1.44
--- src/usr.bin/tmux/cmd-switch-client.c	2017/01/06 13:26:09	1.45
***************
*** 1,4 ****
! /* $OpenBSD: cmd-switch-client.c,v 1.44 2016/10/16 19:04:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-switch-client.c,v 1.45 2017/01/06 13:26:09 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 102,108 ****
  		}
  	}
  
! 	if (c != NULL && !args_has(args, 'E')) {
  		update = options_get_string(s->options, "update-environment");
  		environ_update(update, c->environ, s->environ);
  	}
--- 102,108 ----
  		}
  	}
  
! 	if (!args_has(args, 'E')) {
  		update = options_get_string(s->options, "update-environment");
  		environ_update(update, c->environ, s->environ);
  	}