diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-08-03 17:06:29 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-08-03 17:06:29 +0000 |
| commit | 347cda14cfb08696c2193025afd209cb48372ec9 (patch) | |
| tree | d93b19fc3c71ddb2469670ea13637281a9d9fbaf /server.c | |
| parent | Merge branch 'tilde-expansion-in-include' (diff) | |
| parent | term: send SIGTERM/SIGKILL to the entire process group (diff) | |
Merge branch 'async-client-termination'
Diffstat (limited to 'server.c')
| -rw-r--r-- | server.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -334,9 +334,11 @@ shutdown: fdm_del(fdm, fd); client->fd = -1; - if (client->instance != NULL && !client->instance->terminal->is_shutting_down) + if (client->instance != NULL && + !client->instance->terminal->shutdown.in_progress) + { term_shutdown(client->instance->terminal); - else + } else client_destroy(client); return true; |
