===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -c -r1.128 -r1.129
*** src/usr.bin/tmux/window-copy.c	2015/04/20 15:41:32	1.128
--- src/usr.bin/tmux/window-copy.c	2015/04/21 15:16:06	1.129
***************
*** 1,4 ****
! /* $OpenBSD: window-copy.c,v 1.128 2015/04/20 15:41:32 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window-copy.c,v 1.129 2015/04/21 15:16:06 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 2220,2226 ****
  	u_int			 x, y;
  
  	wp = cmd_mouse_pane(m, NULL, NULL);
! 	if (wp->mode != &window_copy_mode)
  		return;
  
  	if (cmd_mouse_at(wp, m, &x, &y, 1) != 0)
--- 2220,2226 ----
  	u_int			 x, y;
  
  	wp = cmd_mouse_pane(m, NULL, NULL);
! 	if (wp == NULL || wp->mode != &window_copy_mode)
  		return;
  
  	if (cmd_mouse_at(wp, m, &x, &y, 1) != 0)
***************
*** 2242,2248 ****
  	u_int				 x, y, old_cy;
  
  	wp = cmd_mouse_pane(m, NULL, NULL);
! 	if (wp->mode != &window_copy_mode)
  		return;
  	data = wp->modedata;
  
--- 2242,2248 ----
  	u_int				 x, y, old_cy;
  
  	wp = cmd_mouse_pane(m, NULL, NULL);
! 	if (wp == NULL || wp->mode != &window_copy_mode)
  		return;
  	data = wp->modedata;
  
***************
*** 2261,2267 ****
  	struct window_pane	*wp;
  
  	wp = cmd_mouse_pane(m, NULL, NULL);
! 	if (wp->mode != &window_copy_mode)
  		return;
  
  	window_copy_copy_selection(wp, NULL);
--- 2261,2267 ----
  	struct window_pane	*wp;
  
  	wp = cmd_mouse_pane(m, NULL, NULL);
! 	if (wp == NULL || wp->mode != &window_copy_mode)
  		return;
  
  	window_copy_copy_selection(wp, NULL);