summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_thread.cpp
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss@sss.chaoslab.ru>2018-03-27 04:28:35 +0300
committerGluzskiy Alexandr <sss@sss.chaoslab.ru>2018-03-27 04:28:35 +0300
commit8150d61a086cdf72b5aadf585c05b7db5ce6b511 (patch)
treeec04f6461929c1d9b977aad633a98897005b508a /protocols/JabberG/src/jabber_thread.cpp
parent4b425310e632cd9f6fd6c7d76089d8889872bcb4 (diff)
protocols: jabber: omemo
- fix possible crash on early session negotiation
Diffstat (limited to 'protocols/JabberG/src/jabber_thread.cpp')
-rwxr-xr-xprotocols/JabberG/src/jabber_thread.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index c274d62ed1..e75d3ec81f 100755
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -1321,7 +1321,8 @@ void CJabberProto::OnProcessMessage(HXML node, ThreadData *info)
const wchar_t *jid = xmlGetAttrValue(node, L"from");
if (jid)
{
- OmemoHandleMessage(xNode, (wchar_t*)jid, msgTime);
+ if (!OmemoHandleMessage(xNode, (wchar_t*)jid, msgTime))
+ OmemoPutMessageToIncommingQueue(xNode, (wchar_t*)jid, msgTime);
continue;
}
}