1 files changed, 19 insertions, 0 deletions
diff --git a/src/9p_io.zig b/src/9p_io.zig
index 02b9efb5..d6eef9d4 100644
--- a/src/9p_io.zig
+++ b/src/9p_io.zig
@@ -262,6 +262,10 @@ pub const Listener = struct {
         // buffer for it, which a request run while this one waited would
         // write over.
         if (reply.status == .err) return conn.reply(&reply, "");
+        // A write that quits the editor (Kill) is answered now: the editor
+        // is on its way out and will settle nothing this could wait for,
+        // and `deinit` lets the answer out before it cuts the connections.
+        if (core.quit) return conn.reply(&reply, "");
         const restoring = core.restore_req != null;
         if (core.effects_len != 0) pardes.turn.awaitSettled(epoch);
         // Once a wait returns `core` may be gone: a Restore meanwhile put a
@@ -698,6 +702,21 @@ pub const Listener = struct {
             // A connection task may be waiting for the turn; it answers
             // nothing more once stopping, but the wait itself must end.
             pardes.turn.rest();
+            // An answer given as the editor quit (a Kill written to /ctl)
+            // may still be on its way out: let it go before the cut.
+            const deadline = nowMs() +| 200;
+            while (nowMs() < deadline) {
+                const pending = for (&l.runner.conns) |*conn| {
+                    if (!conn.live()) continue;
+                    conn.lock();
+                    const n = conn.engine.output().len;
+                    conn.unlock();
+                    if (n != 0) break true;
+                } else false;
+                if (!pending) break;
+                Client.nap(1);
+            }
+            Client.nap(1); // the last bytes leave the stream's own buffer
             l.runner.stop();
             pardes.turn.wake();
         }