zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-22 10:02:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 48b697f7fd into 9d3cfe1069

Browse source
This commit is contained in:
David Keijser 2017-06-07 10:23:39 +00:00 • committed by GitHub
commit 03037f5bd7
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/core/core.c
View file

@ -200,9 +200,12 @@ void core_preinit(const char *path)
if (irssi_dir[len-1] == G_DIR_SEPARATOR) if (irssi_dir[len-1] == G_DIR_SEPARATOR)
irssi_dir[len-1] = '\0'; irssi_dir[len-1] = '\0';
} }
if (irssi_config_file == NULL) if (irssi_config_file == NULL) {
irssi_config_file = g_strdup_printf("%s/"IRSSI_HOME_CONFIG, irssi_dir); irssi_config_file = g_strdup_printf("%s/irssi/"IRSSI_HOME_CONFIG, g_get_user_config_dir());
else { 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; str = irssi_config_file;
irssi_config_file = fix_path(str); irssi_config_file = fix_path(str);
g_free(str); g_free(str);