From e78fc3364b0440ff82becbec4ae57458374a145f Mon Sep 17 00:00:00 2001
From: Erik Reider <35975961+ErikReider@users.noreply.github.com>
Date: Tue, 14 Feb 2023 16:51:29 +0100
Subject: upstream update: merge sway 1.8.1 (#111)

---
 sway/commands/font.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sway/commands')

diff --git a/sway/commands/font.c b/sway/commands/font.c
index 74bb6b9f..dd80281f 100644
--- a/sway/commands/font.c
+++ b/sway/commands/font.c
@@ -33,10 +33,10 @@ struct cmd_results *cmd_font(int argc, char **argv) {
 		return cmd_results_new(CMD_FAILURE, "Invalid font family.");
 	}
 
-	const gint size = pango_font_description_get_size(font_description);
-	if (size == 0) {
+	const PangoFontMask flags = pango_font_description_get_set_fields(font_description);
+	if ((flags & PANGO_FONT_MASK_SIZE) == 0) {
 		pango_font_description_free(font_description);
-		return cmd_results_new(CMD_FAILURE, "Invalid font size.");
+		return cmd_results_new(CMD_FAILURE, "Font size not given.");
 	}
 
 	if (config->font_description != NULL) {
-- 
cgit v1.2.3