fixes #1940 (Jabber: crash on starting Miranda-NG after last update)

2 files changed, 2 insertions, 2 deletions

diff --git a/protocols/JabberG/src/jabber_omemo.cpp b/protocols/JabberG/src/jabber_omemo.cpp
index cab97f697d..429f8a6ad6 100755
--- a/protocols/JabberG/src/jabber_omemo.cpp
+++ b/protocols/JabberG/src/jabber_omemo.cpp
@@ -1812,7 +1812,7 @@ void CJabberProto::OmemoAnnounceDevice()
 	XmlNodeIq iq("set", SerialNext());

 	iq << XATTR("from", JabberStripJid(m_ThreadInfo->fullJID, szBareJid, _countof_portable(szBareJid)));

 	TiXmlElement *publish_node = iq << XCHILDNS("pubsub", "http://jabber.org/protocol/pubsub") << XCHILD("publish") << XATTR("node", JABBER_FEAT_OMEMO ".devicelist");

-	TiXmlElement *list_node = publish_node << XCHILDNS("item") << XCHILDNS("list", JABBER_FEAT_OMEMO);

+	TiXmlElement *list_node = publish_node << XCHILD("item") << XCHILDNS("list", JABBER_FEAT_OMEMO);

 

 	for (int i = 0; ; ++i) {

 		mir_snprintf(setting_name, "OmemoDeviceId%d", i);

diff --git a/protocols/JabberG/src/jabber_xml.h b/protocols/JabberG/src/jabber_xml.h
index d0babbcfb4..5d96ded78f 100644
--- a/protocols/JabberG/src/jabber_xml.h
+++ b/protocols/JabberG/src/jabber_xml.h
@@ -162,7 +162,7 @@ struct XCHILDNS
 {

 	const char *name, *ns;

 

-	__forceinline XCHILDNS(const char *_name, const char *_ns = nullptr) :

+	__forceinline XCHILDNS(const char *_name, const char *_ns) :

 		name(_name),

 		ns(_ns)

 		{}