diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-21 15:37:03 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-21 15:37:03 +0000 |
| commit | 1cc40518989bc08072ff2069ad2feaba95e00a6a (patch) | |
| tree | 445a903b17310e15f859afea3d89afbd859cb051 /protocols/JabberG/src/jabber_thread.cpp | |
| parent | fef2af8aee7ee759e3123b737ac2e19826ffd6be (diff) | |
fix for the wrong invite detection
git-svn-id: http://svn.miranda-ng.org/main/trunk@15002 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_thread.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_thread.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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)) {
|