no money, no honey (no OMEMO - no queries)

2 files changed, 4 insertions, 1 deletions

diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index 0aafde4364..4201abd31b 100644
--- a/protocols/JabberG/src/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
@@ -1129,6 +1129,9 @@ void CJabberProto::OnIqResultSetVcard(const TiXmlElement *iqNode, CJabberIqInfo*
 

 void CJabberProto::OnIqResultGetOmemodevicelist(const TiXmlElement* iqNode, CJabberIqInfo*)

 {

+	if (!m_bUseOMEMO)

+		return;

+

 	const char *from = XmlGetAttr(iqNode, "from"); //replies for our jid don't contain "from"

 	bool res = false;

 	if (auto *pubsubNode = XmlGetChildByTag(iqNode, "pubsub", "xmlns", JABBER_FEAT_PUBSUB))

diff --git a/protocols/JabberG/src/jabber_omemo.cpp b/protocols/JabberG/src/jabber_omemo.cpp
index 267f5f8608..d67ad88558 100644
--- a/protocols/JabberG/src/jabber_omemo.cpp
+++ b/protocols/JabberG/src/jabber_omemo.cpp
@@ -1726,7 +1726,7 @@ bool CJabberProto::OmemoCheckSession(MCONTACT hContact)
 

 void CJabberProto::OmemoOnIqResultGetBundle(const TiXmlElement *iqNode, CJabberIqInfo *)

 {

-	if (iqNode == nullptr)

+	if (iqNode == nullptr || !m_bUseOMEMO)

 		return;

 

 	const char *jid = XmlGetAttr(iqNode, "from");