diff options
| author | okan <okan> | 2014-02-01 00:25:04 +0000 |
|---|---|---|
| committer | okan <okan> | 2014-02-01 00:25:04 +0000 |
| commit | c7d4add2f27b74f62be3dd973bca402eb89ee5cb (patch) | |
| tree | 95c88f640a491e3ccfc92f9fb7349fe11c296ed6 /calmwm.c | |
| parent | 24f9bfb3ec14268c924ff7094dcede0bc70c5cd2 (diff) | |
| parent | 8b63ac62c2d87eb5c66dea85acaa53ab26898a49 (diff) | |
| download | cwm-c7d4add2f27b74f62be3dd973bca402eb89ee5cb.tar.gz cwm-c7d4add2f27b74f62be3dd973bca402eb89ee5cb.tar.xz cwm-c7d4add2f27b74f62be3dd973bca402eb89ee5cb.zip | |
cvsimport
Diffstat (limited to 'calmwm.c')
| -rw-r--r-- | calmwm.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/calmwm.c b/calmwm.c index 5ea0ac6..0d8aa1c 100644 --- a/calmwm.c +++ b/calmwm.c @@ -108,11 +108,8 @@ main(int argc, char **argv) } conf_init(&Conf); - 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); - } + if (conf_path && (parse_config(conf_path, &Conf) == -1)) + warnx("config file %s has errors", conf_path); free(conf_path); x_init(display_name); @@ -142,7 +139,6 @@ x_init(const char *dpyname) HasRandr = XRRQueryExtension(X_Dpy, &Randr_ev, &i); conf_atoms(); - conf_cursor(&Conf); for (i = 0; i < ScreenCount(X_Dpy); i++) @@ -162,6 +158,8 @@ x_teardown(void) struct screen_ctx *sc; unsigned int i; + conf_clear(&Conf); + TAILQ_FOREACH(sc, &Screenq, entry) { for (i = 0; i < CWM_COLOR_NITEMS; i++) XftColorFree(X_Dpy, sc->visual, sc->colormap, |