Merge branch 'next' into master

[i3/i3] / src / config_parser.c

diff --git a/src/config_parser.c b/src/config_parser.c
index 2d3f3bb919eb2d134baa61f9e510880275fd8210..9f972fed8f80b4510931cac6edb52cef431c832a 100644 (file)
--- a/src/config_parser.c
+++ b/src/config_parser.c
@@ -171,7 +171,7 @@ static long get_long(const char *identifier) {
 
 static void clear_stack(void) {
     for (int c = 0; c < 10; c++) {
 
 static void clear_stack(void) {
     for (int c = 0; c < 10; c++) {

-        if (stack[c].type == STACK_STR && stack[c].val.str != NULL)
+        if (stack[c].type == STACK_STR)

             free(stack[c].val.str);
         stack[c].identifier = NULL;
         stack[c].val.str = NULL;
             free(stack[c].val.str);
         stack[c].identifier = NULL;
         stack[c].val.str = NULL;