Merge branch 'obsd-master'

1 files changed, 18 insertions, 1 deletions

diff --git a/window.c b/window.c
index 16797dfd..a9ea0970 100644
--- a/window.c
+++ b/window.c
@@ -387,6 +387,19 @@ window_destroy(struct window *w)
 	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)
 {
@@ -1014,7 +1027,11 @@ window_pane_error_callback(__unused struct bufferevent *bufev,
 {
 	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