From 1cc40518989bc08072ff2069ad2feaba95e00a6a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 21 Aug 2015 15:37:03 +0000 Subject: fix for the wrong invite detection git-svn-id: http://svn.miranda-ng.org/main/trunk@15002 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_thread.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'protocols/JabberG/src') diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index f533190ef9..31bb9c7241 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1278,12 +1278,12 @@ void CJabberProto::OnProcessMessage(HXML node, ThreadData *info) if (inviteNode != NULL) { inviteFromJid = XmlGetAttrValue(inviteNode, _T("from")); inviteReason = XmlGetText(XmlGetChild(inviteNode, _T("reason"))); + inviteRoomJid = from; + if (inviteReason == NULL) + inviteReason = szMessage; + isChatRoomInvitation = true; + invitePassword = XmlGetText(XmlGetChild(xNode, "password")); } - inviteRoomJid = from; - if (inviteReason == NULL) - inviteReason = szMessage; - isChatRoomInvitation = true; - invitePassword = XmlGetText(XmlGetChild(xNode, "password")); } else if (!mir_tstrcmp(ptszXmlns, JABBER_FEAT_ROSTER_EXCHANGE) && item != NULL && (item->subscription == SUB_BOTH || item->subscription == SUB_TO)) { -- cgit v1.2.3