diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2022-02-06 11:06:23 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2022-02-06 11:07:42 +0000 |
| commit | b0e9ee2137c3a9c491e49322b7b02a1355e5e15f (patch) | |
| tree | 087acd5898919a93e5d5aeec6666143f7cbf72ea | |
| parent | changelog: missing ‘wayland_client’ dependency in test-config (diff) | |
config: font->name may be NULL
If it is, fallback to the font pattern instead, like we used to do
before fcft-3.
| -rw-r--r-- | config.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -3250,10 +3250,14 @@ check_if_font_is_monospaced(const char *pattern, continue; if (last_width >= 0 && g->advance.x != last_width) { + const char *font_name = f->name != NULL + ? f->name + : pattern; + LOG_WARN("%s: font does not appear to be monospace; " "check your config, or disable this warning by " "setting [tweak].font-monospace-warn=no", - f->name); + font_name); static const char fmt[] = "%s: font does not appear to be monospace; " @@ -3261,7 +3265,7 @@ check_if_font_is_monospaced(const char *pattern, "setting \033[1m[tweak].font-monospace-warn=no\033[22m"; user_notification_add_fmt( - notifications, USER_NOTIFICATION_WARNING, fmt, f->name); + notifications, USER_NOTIFICATION_WARNING, fmt, font_name); is_monospaced = false; break; |
