From 51b3fbee52a54cd068b5485542b454244d651c34 Mon Sep 17 00:00:00 2001
From: okan <okan>
Date: Tue, 28 Jan 2014 00:42:20 +0000
Subject: Move conf_init/clear into main - no behaviour change; from Tiago
 Cunha.

---
 calmwm.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'calmwm.c')

diff --git a/calmwm.c b/calmwm.c
index 1c38b2e..abdb79c 100644
--- a/calmwm.c
+++ b/calmwm.c
@@ -108,8 +108,11 @@ main(int argc, char **argv)
 	}
 
 	conf_init(&Conf);
-	if (conf_path && (parse_config(conf_path, &Conf) == -1))
+	if (conf_path && (parse_config(conf_path, &Conf) == -1)) {
 		warnx("config file %s has errors, not loading", conf_path);
+		conf_clear(&Conf);
+		conf_init(&Conf);
+	}
 	free(conf_path);
 
 	x_init(display_name);
-- 
cgit 1.4.1