Merge pull request #3473 from soumya92/pango-font-alignment

[i3/i3] / libi3 / font.c

diff --git a/libi3/font.c b/libi3/font.c
index 7d776ad1350054ac1495e9747e9a9158dccc8cf0..c06bae00c86fd6a32be6f897fd36d03ae01c24bc 100644 (file)
--- a/libi3/font.c
+++ b/libi3/font.c
@@ -223,9 +223,7 @@ i3Font load_font(const char *pattern, const bool fallback) {
                      error->error_code);
         }
     }
-    if (error != NULL) {
-        free(error);
-    }
+    free(error);
 
     font.pattern = sstrdup(pattern);
     LOG("Using X font %s\n", pattern);
@@ -274,8 +272,7 @@ void free_font(void) {
         case FONT_TYPE_XCB: {
             /* Close the font and free the info */
             xcb_close_font(conn, savedFont->specific.xcb.id);
-            if (savedFont->specific.xcb.info)
-                free(savedFont->specific.xcb.info);
+            free(savedFont->specific.xcb.info);
             break;
         }
         case FONT_TYPE_PANGO: