summaryrefslogtreecommitdiff
path: root/src/fe-common
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/fe-common
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/fe-common')
-rw-r--r--src/fe-common/core/fe-settings.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c
index f44138fb..c359c148 100644
--- a/src/fe-common/core/fe-settings.c
+++ b/src/fe-common/core/fe-settings.c
@@ -245,14 +245,14 @@ static void cmd_unalias(const char *data)
/* SYNTAX: RELOAD [<file>] */
static void cmd_reload(const char *data)
{
- char *fname;
+ const char *fname;
+
+ fname = *data == '\0' ? get_irssi_config() : data;
- fname = *data == '\0' ? NULL : g_strdup(data);
if (settings_reread(fname)) {
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
TXT_CONFIG_RELOADED, fname);
}
- g_free_not_null(fname);
}
static void settings_save_fe(const char *fname)