From d1e1ee5ed76c66af0a05dbad7ba7b27c9aa63d3c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 6 Sep 2024 14:26:51 +0300 Subject: =?UTF-8?q?fixes=20#4619=20(Highlighting:=20=D0=BD=D0=B5=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9,=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=D1=88=D0=B5=D0=B4=D1=88=D0=B8=D1=85=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BA=D0=B0=20=D0=B1=D1=8B=D0=BB=20=D0=B2=20=D0=BE=D1=84?= =?UTF-8?q?=D1=84=D0=BB=D0=B0=D0=B9=D0=BD=D0=B5,=20=D0=B8=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=D1=88=D0=B5=D0=B4=D1=88=D0=B8=D1=85=20=D0=BE=D1=82=20?= =?UTF-8?q?=D1=81=D0=B5=D0=B1=D1=8F=20=D1=81=D0=B0=D0=BC=D0=BE=D0=B3=D0=BE?= =?UTF-8?q?=20=D1=81=20=D0=B4=D1=80=D1=83=D0=B3=D0=BE=D0=B3=D0=BE=20=D1=83?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=B9=D1=81=D1=82=D0=B2=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mir_app/src/chat_tools.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/mir_app') diff --git a/src/mir_app/src/chat_tools.cpp b/src/mir_app/src/chat_tools.cpp index e20d917ee6..b9d2016103 100644 --- a/src/mir_app/src/chat_tools.cpp +++ b/src/mir_app/src/chat_tools.cpp @@ -743,10 +743,12 @@ void Chat_EventToGC(SESSION_INFO *si, MEVENT hDbEvent) gce.dwFlags |= GCEF_NOTNOTIFY; Utf2T wszUserId(dbei.szUserId); - if (g_chatApi.UM_FindUser(si, wszUserId)) + if (auto *pUser = g_chatApi.UM_FindUser(si, wszUserId)) { gce.pszUID.w = wszUserId; - else - gce.pszNick.w = wszUserId; + gce.pszNick.w = pUser->pszNick; + } + else gce.pszNick.w = wszUserId; + gce.pszText.w = wszText; gce.time = dbei.timestamp; gce.hEvent = hDbEvent; -- cgit v1.2.3