summaryrefslogtreecommitdiff
path: root/src/core/settings.c
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2001-07-29 00:27:23 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2001-07-29 00:27:23 +0000
commit802ee7564c4001f722eb2fde35e36627c9248cd7 (patch)
tree3cde24c52bf3bc8e3db877a66a414ae773ee2e4a /src/core/settings.c
parent96682854671612a9eabaca7700eecfa38c38eabd (diff)
downloadirssi-802ee7564c4001f722eb2fde35e36627c9248cd7.zip
Fixed /RELOAD crashing without parameters.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1664 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core/settings.c')
-rw-r--r--src/core/settings.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/settings.c b/src/core/settings.c
index 9f7b21a3..bbc85b97 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -556,9 +556,9 @@ int settings_reread(const char *fname)
CONFIG_REC *tempconfig;
char *str;
- str = convert_home(fname);
+ str = fname == NULL ? NULL : convert_home(fname);
tempconfig = parse_configfile(str);
- g_free(str);
+ g_free_not_null(str);
if (tempconfig == NULL) {
signal_emit("gui dialog", 2, "error", g_strerror(errno));