diff options
Diffstat (limited to 'protocols/JabberG/src/jabber_thread.cpp')
| -rwxr-xr-x | protocols/JabberG/src/jabber_thread.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 1177020ab0..4801e50179 100755 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1062,6 +1062,10 @@ void CJabberProto::OnProcessMessage(HXML node, ThreadData *info) carbonSent = true;
}
if (carbon) {
+ //If carbons are disabled in options, we should ignore occasional carbons sent to us by server
+ if (!m_options.EnableCarbons)
+ return;
+
HXML forwarded = NULL;
HXML message = NULL;
//Carbons MUST have forwarded/message content
|