Merge branch 'master' into next

2014-07-02 19:06:01 +02:00
parent bb24db1986 04d292375d
commit 5cbe2d63c0
1 changed files with 3 additions and 4 deletions
--- a/i3bar/src/config.c
+++ b/i3bar/src/config.c
@ -248,8 +248,7 @@ void parse_config_json(char *json) {
 void free_colors(struct xcb_color_strings_t *colors) {
 #define FREE_COLOR(x)    \
    do {                 \
-        if (colors->x)       \
-            free(colors->x); \
+        FREE(colors->x); \
    } while (0)
    FREE_COLOR(bar_fg);
    FREE_COLOR(bar_bg);