aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Fixed /RELOAD crashing without parameters.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1664 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-07-29 00:27:23 +00:00 committed by cras
parent 9668285467
commit 802ee7564c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/settings.c
View File

@ -556,9 +556,9 @@ int settings_reread(const char *fname)
CONFIG_REC *tempconfig; CONFIG_REC *tempconfig;
char *str; char *str;
str = convert_home(fname); str = fname == NULL ? NULL : convert_home(fname);
tempconfig = parse_configfile(str); tempconfig = parse_configfile(str);
g_free(str); g_free_not_null(str);
if (tempconfig == NULL) { if (tempconfig == NULL) {
signal_emit("gui dialog", 2, "error", g_strerror(errno)); signal_emit("gui dialog", 2, "error", g_strerror(errno));

6
src/fe-common/core/fe-settings.c
View File

@ -245,14 +245,14 @@ static void cmd_unalias(const char *data)
/* SYNTAX: RELOAD [<file>] */ /* SYNTAX: RELOAD [<file>] */
static void cmd_reload(const char *data) 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)) { if (settings_reread(fname)) {
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
TXT_CONFIG_RELOADED, fname); TXT_CONFIG_RELOADED, fname);
} }
g_free_not_null(fname);
} }
static void settings_save_fe(const char *fname) static void settings_save_fe(const char *fname)