From 120207f1f98a5943736941176f09ce975c0b4f11 Mon Sep 17 00:00:00 2001 From: o9000 Date: Fri, 1 Sep 2017 18:02:35 +0200 Subject: [PATCH] Fix regression in cli handling --- src/config.c | 2 ++ src/init.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/config.c b/src/config.c index 287f0f3..c3fc549 100644 --- a/src/config.c +++ b/src/config.c @@ -1300,6 +1300,8 @@ void add_entry(char *key, char *value) gboolean config_read_file(const char *path) { + fprintf(stderr, "Loading config file: %s\n", path); + FILE *fp = fopen(path, "r"); if (!fp) return FALSE; diff --git a/src/init.c b/src/init.c index bfb55e6..f38357f 100644 --- a/src/init.c +++ b/src/init.c @@ -133,7 +133,6 @@ void start_detect_compositor() void create_default_elements() { - default_config(); default_timeout(); default_systray(); memset(&server, 0, sizeof(server)); @@ -212,6 +211,7 @@ void init(int argc, char **argv) { setlinebuf(stdout); setlinebuf(stderr); + default_config(); handle_cli_arguments(argc, argv); create_default_elements(); init_signals();