diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-09-05 07:28:19 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-09-05 07:28:19 +0000 |
| commit | f39a62fa5e9207a6f8c16066527c68ca9a5524a6 (patch) | |
| tree | cca622106261491c8644396873fa1bd34e4fb07d /server.c | |
| parent | render: unref clip region (diff) | |
server: no need to clone the config to handle -N,--no-wait
Diffstat (limited to 'server.c')
| -rw-r--r-- | server.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -277,16 +277,12 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data) const bool need_to_clone_conf = tll_length(overrides)> 0 || - cdata.hold != server->conf->hold_at_exit || - cdata.no_wait != server->conf->no_wait; + cdata.hold != server->conf->hold_at_exit; struct config *conf = NULL; if (need_to_clone_conf) { conf = config_clone(server->conf); - if (cdata.no_wait != server->conf->no_wait) - conf->no_wait = cdata.no_wait; - if (cdata.hold != server->conf->hold_at_exit) conf->hold_at_exit = cdata.hold; @@ -317,7 +313,7 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data) goto shutdown; } - if (conf != NULL && conf->no_wait) { + if (cdata.no_wait) { // the server owns the instance tll_push_back(server->terminals, instance); client_send_exit_code(client, 0); |
