From b0e9ee2137c3a9c491e49322b7b02a1355e5e15f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Sun, 6 Feb 2022 12:06:23 +0100 Subject: [PATCH] config: font->name may be NULL If it is, fallback to the font pattern instead, like we used to do before fcft-3. --- config.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config.c b/config.c index af2a6a4f..0c9c8f43 100644 --- a/config.c +++ b/config.c @@ -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;