server: no need to clone the config to handle -N,--no-wait

This commit is contained in:
Daniel Eklöf 2021-09-05 09:28:19 +02:00
parent 26859a5168
commit f39a62fa5e
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 2 additions and 7 deletions

View file

@ -70,7 +70,6 @@ struct config {
char *app_id;
wchar_t *word_delimiters;
bool login_shell;
bool no_wait;
bool locked_title;
struct {

View file

@ -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);