From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 23 Oct 2011 21:02:11 +0000 (+0100)
Subject: Actually make load_font only fallback if 'fallback' is true
X-Git-Tag: 4.1~54
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8da6049ca9e16d4988e09a334ab8be5e09ee96cc;p=i3%2Fi3

Actually make load_font only fallback if 'fallback' is true
---

diff --git a/src/xcb.c b/src/xcb.c
index d9891bfc..2b9ad7bf 100644
--- a/src/xcb.c
+++ b/src/xcb.c
@@ -32,7 +32,7 @@ i3Font load_font(const char *pattern, bool fallback) {
     xcb_generic_error_t *error = xcb_request_check(conn, font_cookie);
 
     /* If we fail to open font, fall back to 'fixed'. If opening 'fixed' fails fall back to '-misc-*' */
-    if (error != NULL) {
+    if (fallback && error != NULL) {
         ELOG("Could not open font %s (X error %d). Reverting to backup font.\n", pattern, error->error_code);
         pattern = "fixed";
         font_cookie = xcb_open_font_checked(conn, new.id, strlen(pattern), pattern);