fix for some problems with Jabber registration

git-svn-id: http://svn.miranda-ng.org/main/trunk@17197 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 5 insertions, 6 deletions

diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index 407def3d3d..fa9f273a39 100755
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -1875,10 +1875,6 @@ void CJabberProto::OnProcessRegIq(HXML node, ThreadData *info)
 

 	int id = JabberGetPacketID(node);

 

-	LPCTSTR from = XmlGetAttrValue(node, L"from");

-	if (from == NULL)

-		return;

-

 	if (!mir_wstrcmp(type, L"result")) {

 		HXML queryNode = XmlGetChild(node, L"query");

 		if (queryNode != NULL) {

@@ -1888,8 +1884,11 @@ void CJabberProto::OnProcessRegIq(HXML node, ThreadData *info)
 				if (xNode != NULL) {

 					str = XmlGetAttrValue(xNode, L"xmlns");

 					if (!mir_wstrcmp(str, JABBER_FEAT_DATA_FORMS)) {

-						m_regInfo = info;

-						FormCreateDialog(xNode, L"Jabber register new user", &CJabberProto::SetRegConfig, mir_wstrdup(from));

+						LPCTSTR from = XmlGetAttrValue(node, L"from");

+						if (from != NULL) {

+							m_regInfo = info;

+							FormCreateDialog(xNode, L"Jabber register new user", &CJabberProto::SetRegConfig, mir_wstrdup(from));

+						}

 						return;

 					}

 				}