Jabber: more fool-proof check for empty nicks

2 files changed, 3 insertions, 3 deletions

diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index 0a40a61b8b..ae375fc6f8 100755
--- a/protocols/JabberG/src/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
@@ -277,8 +277,8 @@ void CJabberProto::OnIqResultSetAuth(const TiXmlElement *iqNode, CJabberIqInfo*)
 	if ((type = XmlGetAttr(iqNode, "type")) == nullptr) return;

 

 	if (!mir_strcmp(type, "result")) {

-		ptrA tszNick(getUStringA("Nick"));

-		if (tszNick == nullptr)

+		ptrA szNick(getUStringA("Nick"));

+		if (!mir_strlen(szNick))

 			setUString("Nick", m_ThreadInfo->conn.username);

 

 		OnLoggedIn();

diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index 32eb344178..5ba36d7907 100755
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -836,7 +836,7 @@ void CJabberProto::OnProcessSuccess(const TiXmlElement *node, ThreadData *info)
 

 		debugLogA("Success: Logged-in.");

 		ptrA szNick(getUStringA("Nick"));

-		if (szNick == nullptr)

+		if (!mir_strlen(szNick))

 			setUString("Nick", info->conn.username);

 

 		xmlStreamInitialize("after successful sasl");