From 17a58dfa0049ebb77d2e48672322eff8bcd0c23d Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Sun, 16 Apr 2017 17:04:25 -0700 Subject: Move `handle_settings` before `xt_handle`. `utf8_nicks` should be enabled before handling `nick` fields in because `nick_strip` uses `IRC_UTF8_NICKS` which is only available after calling `handle_settings`. --- storage_xml.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage_xml.c b/storage_xml.c index a921524f..cf4d35d7 100644 --- a/storage_xml.c +++ b/storage_xml.c @@ -293,12 +293,12 @@ static storage_status_t xml_load_real(irc_t *irc, const char *my_nick, const cha goto error; } + handle_settings(node, &xd->irc->b->set); + if (xt_handle(xp, NULL, 1) == XT_HANDLED) { ret = STORAGE_OK; } - handle_settings(node, &xd->irc->b->set); - error: xt_free(xp); g_free(fn); -- cgit v1.2.3