From 47d0d742d0ba7cac754a7b1765328fb33a14ffc0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 12 Feb 2015 17:19:11 +0000 Subject: complex fix against NULL in nicks git-svn-id: http://svn.miranda-ng.org/main/trunk@12097 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/WhatsApp/src/chat.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'protocols') diff --git a/protocols/WhatsApp/src/chat.cpp b/protocols/WhatsApp/src/chat.cpp index d6c650ec9d..a5be1e9bac 100644 --- a/protocols/WhatsApp/src/chat.cpp +++ b/protocols/WhatsApp/src/chat.cpp @@ -327,11 +327,16 @@ WAChatInfo* WhatsAppProto::InitChat(const std::string &jid, const std::string &n TCHAR* WhatsAppProto::GetChatUserNick(const std::string &jid) { - if (m_szJid == jid) - return str2t(m_szNick); + TCHAR* tszNick; + if (m_szJid != jid) { + MCONTACT hContact = ContactIDToHContact(jid); + tszNick = (hContact == 0) ? utils::removeA(str2t(jid)) : mir_tstrdup(pcli->pfnGetContactDisplayName(hContact, 0)); + } + else tszNick = str2t(m_szNick); - MCONTACT hContact = ContactIDToHContact(jid); - return (hContact == 0) ? utils::removeA(str2t(jid)) : mir_tstrdup(pcli->pfnGetContactDisplayName(hContact, 0)); + if (tszNick == NULL) + tszNick = mir_tstrdup(TranslateT("Unknown user")); + return tszNick; } WAChatInfo* WhatsAppProto::SafeGetChat(const std::string &jid) -- cgit v1.2.3