summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeert Hauwaerts <geert@irssi.org>2006-11-02 09:09:34 +0000
committerGeert <Geert@dbcabf3a-b0e7-0310-adc4-f8d773084564>2006-11-02 09:09:34 +0000
commit0aca74b6e35f55c601f91621fb64acbf402cece2 (patch)
tree9fb01e6c0293923ca08867f5e2e227dd5d5ac280
parent00fdaf4d7294494493b53ae0e3031a273e0b9c2c (diff)
downloadirssi-0aca74b6e35f55c601f91621fb64acbf402cece2.zip
The attached patch fixes bug #164, which triggers a failed assertion
message when the config file is unreadable to irssi. By Daniel Koning <dkoning@seas.smu.edu> git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4395 dbcabf3a-b0e7-0310-adc4-f8d773084564
-rw-r--r--src/core/settings.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/settings.c b/src/core/settings.c
index ce230f8a..be49d800 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -692,7 +692,7 @@ static CONFIG_REC *parse_configfile(const char *fname)
config = config_open(NULL, -1);
}
- if (path != NULL)
+ if (config->fname != NULL)
config_parse(config);
else
config_parse_data(config, default_config, "internal");