From 48b697f7fdb059ab78ded88705fe6d36a02f6f97 Mon Sep 17 00:00:00 2001 From: David Keijser Date: Thu, 19 Jun 2014 19:11:18 +0200 Subject: [PATCH] attempt to load config from user config directory --- src/core/core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/core/core.c b/src/core/core.c index b9debbb5..f050c9ca 100644 --- a/src/core/core.c +++ b/src/core/core.c @@ -196,9 +196,12 @@ void core_preinit(const char *path) if (irssi_dir[len-1] == G_DIR_SEPARATOR) irssi_dir[len-1] = '\0'; } - if (irssi_config_file == NULL) - irssi_config_file = g_strdup_printf("%s/"IRSSI_HOME_CONFIG, irssi_dir); - else { + if (irssi_config_file == NULL) { + irssi_config_file = g_strdup_printf("%s/irssi/"IRSSI_HOME_CONFIG, g_get_user_config_dir()); + if (!g_file_test (irssi_config_file, G_FILE_TEST_EXISTS)) { + irssi_config_file = g_strdup_printf("%s/"IRSSI_HOME_CONFIG, irssi_dir); + } + } else { str = irssi_config_file; irssi_config_file = fix_path(str); g_free(str);