===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- src/usr.bin/tmux/window.c	2017/06/28 11:36:40	1.199
+++ src/usr.bin/tmux/window.c	2017/07/03 08:16:03	1.200
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.199 2017/06/28 11:36:40 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.200 2017/07/03 08:16:03 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -388,6 +388,19 @@
 	free(w);
 }
 
+int
+window_pane_destroy_ready(struct window_pane *wp)
+{
+	if (wp->pipe_fd != -1 && EVBUFFER_LENGTH(wp->pipe_event->output) != 0)
+		return (0);
+
+	if (~wp->flags & PANE_EXITED)
+		return (0);
+	if (~wp->flags & PANE_ERROR)
+		return (0);
+	return (1);
+}
+
 void
 window_add_ref(struct window *w, const char *from)
 {
@@ -1000,7 +1013,11 @@
 {
 	struct window_pane *wp = data;
 
-	server_destroy_pane(wp, 1);
+	log_debug("%%%u error", wp->id);
+	wp->flags |= PANE_ERROR;
+
+	if (window_pane_destroy_ready(wp))
+		server_destroy_pane(wp, 1);
 }
 
 void