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

Don't crash with /me in dcc, or dcc message on disconnected server, with recode (Bug 330)

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4033 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Wouter Coekaerts 2005-10-10 10:04:51 +00:00 committed by coekie
parent aea901728e
commit c701330433
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/recode.c
View File

@ -98,7 +98,7 @@ char *recode_in(const SERVER_REC *server, const char *str, const char *target)
if (target != NULL && from == NULL) if (target != NULL && from == NULL)
from = iconfig_get_str("conversions", target, NULL); from = iconfig_get_str("conversions", target, NULL);
if (from == NULL) if (from == NULL && server != NULL)
from = iconfig_get_str("conversions", server->tag, NULL); from = iconfig_get_str("conversions", server->tag, NULL);
term_is_utf8 = recode_get_charset(&to); 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); g_free(tagtarget);
if (to == NULL || *to == '\0') if (to == NULL || *to == '\0')
to = iconfig_get_str("conversions", target, NULL); 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); to = iconfig_get_str("conversions", server->tag, NULL);
if (to == NULL || *to == '\0') if (to == NULL || *to == '\0')
/* default outgoing charset if set */ /* default outgoing charset if set */