===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/popup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/tmux/popup.c	2020/03/28 09:39:44	1.2
--- src/usr.bin/tmux/popup.c	2020/03/28 09:51:12	1.3
***************
*** 1,4 ****
! /* $OpenBSD: popup.c,v 1.2 2020/03/28 09:39:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: popup.c,v 1.3 2020/03/28 09:51:12 nicm Exp $ */
  
  /*
   * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 260,266 ****
  	if (pd->ictx != NULL && (pd->flags & POPUP_WRITEKEYS)) {
  		if (KEYC_IS_MOUSE(event->key))
  			return (0);
! 		if ((~pd->flags & POPUP_CLOSEEXIT) &&
  		    (event->key == '\033' || event->key == '\003'))
  			return (1);
  		if (pd->job == NULL)
--- 260,267 ----
  	if (pd->ictx != NULL && (pd->flags & POPUP_WRITEKEYS)) {
  		if (KEYC_IS_MOUSE(event->key))
  			return (0);
! 		if (((pd->flags & (POPUP_CLOSEEXIT|POPUP_CLOSEEXITZERO)) == 0 ||
! 		    pd->job == NULL) &&
  		    (event->key == '\033' || event->key == '\003'))
  			return (1);
  		if (pd->job == NULL)
***************
*** 346,351 ****
--- 347,354 ----
  	pd->job = NULL;
  
  	if (pd->flags & POPUP_CLOSEEXIT)
+ 		server_client_clear_overlay(pd->c);
+ 	if ((pd->flags & POPUP_CLOSEEXITZERO) && pd->status == 0)
  		server_client_clear_overlay(pd->c);
  }