diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-10-01 18:50:32 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-10-01 18:50:32 +0000 |
| commit | a082fec786d44bfbe8d2172c6317121027735a6b (patch) | |
| tree | cf2a9fc4a822f4701a0a90db41b1c3ac03dd333a /server.c | |
| parent | meson/pkgbuild: bump version to 1.9.0 (diff) | |
| parent | Merge branch 'hacktober-theme' (diff) | |
Merge branch 'master' into releases/1.9
Diffstat (limited to 'server.c')
| -rw-r--r-- | server.c | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -277,20 +277,22 @@ 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; config_override_apply(conf, &overrides, false); + + if (conf->tweak.font_monospace_warn && conf->fonts[0].count > 0) { + check_if_font_is_monospaced( + conf->fonts[0].arr[0].pattern, + &conf->notifications); + } } *instance = (struct terminal_instance) { @@ -311,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); |
