From 15ca96698292748d79b3961c28b896d94facbac2 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 7 Feb 2017 14:04:18 +0300
Subject: if a user's nick is skipped, we try to restore it from the users list

---
 src/mir_app/src/chat_svc.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/mir_app/src/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp
index 2a09052ef1..c5ca2b9255 100644
--- a/src/mir_app/src/chat_svc.cpp
+++ b/src/mir_app/src/chat_svc.cpp
@@ -550,8 +550,13 @@ EXTERN_C MIR_APP_DLL(int) Chat_Event(GCEVENT *gce)
 			return 0;
 
 		if (si && (si->bInitDone || gcd->iType == GC_EVENT_TOPIC || (gcd->iType == GC_EVENT_JOIN && gce->bIsMe))) {
+			if (gce->ptszNick == nullptr && gce->ptszUID != nullptr) {
+				USERINFO *ui = chatApi.UM_FindUser(si->pUsers, gce->ptszUID);
+				if (ui != nullptr)
+					gce->ptszNick = ui->pszNick;				
+			}
+			
 			int isOk = SM_AddEvent(pWnd, pMod, gce, bIsHighlighted);
-
 			if (si->hWnd) {
 				if (isOk)
 					SendMessage(si->hWnd, GC_ADDLOG, 0, 0);
-- 
cgit v1.2.3