summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-02-19 13:55:27 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-02-19 13:55:27 +0000
commita618c39f0c85738d816189d644c3cfc5d04ceea1 (patch)
treec6e815d25660049da83d8f751df49f0bb69d76a3
parentdf0c81e683bc2f4ab83fa9938ef51b321ddbcbd4 (diff)
bugfix for the wrong chats caching
git-svn-id: http://svn.miranda-ng.org/main/trunk@12195 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--protocols/WhatsApp/src/chat.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/protocols/WhatsApp/src/chat.cpp b/protocols/WhatsApp/src/chat.cpp
index 8c5d83c7bb..2bd10dc74f 100644
--- a/protocols/WhatsApp/src/chat.cpp
+++ b/protocols/WhatsApp/src/chat.cpp
@@ -322,8 +322,7 @@ WAChatInfo* WhatsAppProto::InitChat(const std::string &jid, const std::string &n
gcw.ptszID = ptszJid;
CallServiceSync(MS_GC_NEWSESSION, NULL, (LPARAM)&gcw);
- if (hOldContact == NULL)
- pInfo->hContact = ContactIDToHContact(jid);
+ pInfo->hContact = (hOldContact != NULL) ? hOldContact : ContactIDToHContact(jid);
GCDEST gcd = { m_szModuleName, ptszJid, GC_EVENT_ADDGROUP };
GCEVENT gce = { sizeof(gce), &gcd };