diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-10-21 14:33:45 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-10-21 14:33:45 +0000 |
| commit | 353e51b0a15cc9113ef868d557e9344744943ae6 (patch) | |
| tree | 2eba0cc92115fd9e593a1e2ad9784b2110d7771c /main.c | |
| parent | changelog: restored -> restore (diff) | |
| parent | doc: foot.ini.5: mention how one can disable bold/italic fonts completely (diff) | |
Merge branch 'custom-bold-italic-fonts'
Closes #169
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -27,6 +27,7 @@ #include "server.h" #include "shm.h" #include "terminal.h" +#include "util.h" #include "version.h" #include "xmalloc.h" @@ -387,11 +388,13 @@ main(int argc, char *const *argv) if (login_shell) conf.login_shell = true; if (tll_length(conf_fonts) > 0) { - tll_foreach(conf.fonts, it) - config_font_destroy(&it->item); - tll_free(conf.fonts); + for (size_t i = 0; i < ALEN(conf.fonts); i++) { + tll_foreach(conf.fonts[i], it) + config_font_destroy(&it->item); + tll_free(conf.fonts[i]); + } tll_foreach(conf_fonts, it) - tll_push_back(conf.fonts, config_font_parse(it->item)); + tll_push_back(conf.fonts[0], config_font_parse(it->item)); tll_free(conf_fonts); } if (conf_width > 0 && conf_height > 0) { |
