Merge branch 'master' into next

[i3/i3] / src / cfgparse.y

diff --git a/src/cfgparse.y b/src/cfgparse.y
index 79da317d2e19a3b9cc668aee4918d5af043d76e3..0d2c69771814c2ad0ced926efe26d12648e1b6a2 100644 (file)
--- a/src/cfgparse.y
+++ b/src/cfgparse.y
@@ -1546,6 +1546,7 @@ font:
     TOKFONT STR
     {
         config.font = load_font($2, true);
+        set_font(&config.font);
         printf("font %s\n", $2);
         FREE(font_pattern);
         font_pattern = $2;