aboutsummaryrefslogtreecommitdiffstats
path: root/storage_xml.c
diff options
context:
space:
mode:
authorMarius Halden <marius.h@lden.org>2017-05-14 14:11:07 +0200
committerMarius Halden <marius.h@lden.org>2017-05-14 14:11:07 +0200
commit52b77bf257ac24a69f596748c5c56af1f0cdac86 (patch)
tree318d739b54968f15197a2bdd1aaca96179b1862a /storage_xml.c
parent64f4d843217aed18605284f8c4ebba93724e5a63 (diff)
parent54b2a367f6986a74fd6b4e50a0ae2c5cdb3a40cb (diff)
Merge branch 'master' into patched-master
Diffstat (limited to 'storage_xml.c')
-rw-r--r--storage_xml.c4
1 files 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);