Clean up how quit and server shutdown trigger connection close

[empserver] / src / server / main.c

diff --git a/src/server/main.c b/src/server/main.c
index 22ef0b2e86ac5129d972074b6756b722979091be..becfeb34ae1ae10d9e29177ac084ce1ed417a6f7 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -419,9 +419,9 @@ shutdwn(int sig)
        if (p->state != PS_PLAYING)
            continue;
        pr_flash(p, "Server shutting down...\n");
-       p->state = PS_SHUTDOWN;
+       io_set_eof(p->iop);
+       p->aborted = 1;
        p->may_sleep = PLAYER_SLEEP_NEVER;
-       p->aborted++;
        if (p->command) {
            pr_flash(p, "Shutdown aborting command\n");
        }