diff options
| author | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2017-06-19 11:06:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 11:06:24 +0200 |
| commit | 1fc170ee11c308fae14a06aa29f2d8e3882cf9ce (patch) | |
| tree | 3729b0a24fd3b207c2f717da770407ba27f1d5bf /src/fe-common | |
| parent | 4edfccfce794d4c10b2a92c02fe982bb089c6629 (diff) | |
| parent | 9d3cfe1069b5cfaf0efb972e36695b781ecf93de (diff) | |
| download | irssi-1fc170ee11c308fae14a06aa29f2d8e3882cf9ce.zip | |
Merge branch 'master' into regexex
Diffstat (limited to 'src/fe-common')
| -rw-r--r-- | src/fe-common/irc/dcc/fe-dcc-get.c | 2 | ||||
| -rw-r--r-- | src/fe-common/irc/dcc/fe-dcc-send.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/fe-common/irc/dcc/fe-dcc-get.c b/src/fe-common/irc/dcc/fe-dcc-get.c index 675cab65..99b6b963 100644 --- a/src/fe-common/irc/dcc/fe-dcc-get.c +++ b/src/fe-common/irc/dcc/fe-dcc-get.c @@ -108,7 +108,7 @@ static void dcc_error_close_not_found(const char *type, const char *nick, g_return_if_fail(fname != NULL); if (g_ascii_strcasecmp(type, "GET") != 0) return; - if (fname == '\0') fname = "(ANY)"; + if (fname == NULL || *fname == '\0') fname = "(ANY)"; printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_GET_NOT_FOUND, nick, fname); } diff --git a/src/fe-common/irc/dcc/fe-dcc-send.c b/src/fe-common/irc/dcc/fe-dcc-send.c index 1fc43abd..7920bedc 100644 --- a/src/fe-common/irc/dcc/fe-dcc-send.c +++ b/src/fe-common/irc/dcc/fe-dcc-send.c @@ -108,7 +108,7 @@ static void dcc_error_close_not_found(const char *type, const char *nick, g_return_if_fail(fname != NULL); if (g_ascii_strcasecmp(type, "SEND") != 0) return; - if (fname == '\0') fname = "(ANY)"; + if (fname == NULL || *fname == '\0') fname = "(ANY)"; printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_SEND_NOT_FOUND, nick, fname); } |