From c701330433d9c85dbf7f2078d56a8529c904e1b5 Mon Sep 17 00:00:00 2001 From: Wouter Coekaerts Date: Mon, 10 Oct 2005 10:04:51 +0000 Subject: [PATCH] Don't crash with /me in dcc, or dcc message on disconnected server, with recode (Bug 330) git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4033 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/core/recode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/recode.c b/src/core/recode.c index 0a35a06c..65da780d 100644 --- a/src/core/recode.c +++ b/src/core/recode.c @@ -98,7 +98,7 @@ char *recode_in(const SERVER_REC *server, const char *str, const char *target) if (target != NULL && from == NULL) from = iconfig_get_str("conversions", target, NULL); - if (from == NULL) + if (from == NULL && server != NULL) from = iconfig_get_str("conversions", server->tag, NULL); term_is_utf8 = recode_get_charset(&to); @@ -162,7 +162,7 @@ char *recode_out(const SERVER_REC *server, const char *str, const char *target) g_free(tagtarget); if (to == NULL || *to == '\0') to = iconfig_get_str("conversions", target, NULL); - if (to == NULL || *to == '\0') + if ((to == NULL || *to == '\0') && server != NULL) to = iconfig_get_str("conversions", server->tag, NULL); if (to == NULL || *to == '\0') /* default outgoing charset if set */