From 1adcb519ac395a83979c72f3cfd7e1f9e01d4962 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Mar 2024 17:31:26 +0300 Subject: =?UTF-8?q?fixes=20#4302=20(Msg=5FExport:=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D1=8D=D0=BA=D1=81=D0=BF=D0=BE=D1=80=D1=82=D0=B5=20=D0=B8=D1=81?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=B8=D0=B8=20=D0=B2=D0=B5=D1=82=D0=BA=D0=B8?= =?UTF-8?q?=20Telegram=20=D0=B2=20=D0=BF=D0=BE=D0=BB=D0=B5=20"=D0=9A=D0=BE?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=D0=BA=D1=82"=20=D0=BF=D0=BE=D0=BC=D0=B5?= =?UTF-8?q?=D1=89=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D0=BF=D0=B5=D1=80=D0=B2?= =?UTF-8?q?=D1=8B=D0=B9=20=D0=BD=D0=B8=D0=BA=20=D0=B2=20=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=B8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/Msg_Export/src/utils.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'plugins/Msg_Export') diff --git a/plugins/Msg_Export/src/utils.cpp b/plugins/Msg_Export/src/utils.cpp index 071d2ae43f..88190f67e4 100644 --- a/plugins/Msg_Export/src/utils.cpp +++ b/plugins/Msg_Export/src/utils.cpp @@ -621,10 +621,6 @@ static bool ExportDBEventInfo(MCONTACT hContact, HANDLE hFile, const wstring &sF else { sLocalUser = ptrW(GetMyOwnNick(hContact)); sRemoteUser = Clist_GetContactDisplayName(hContact); - if (dbei.szUserId && Contact::IsGroupChat(hContact)) - if (auto *si = Chat_Find(hContact, szProto)) - if (auto *pUser = g_chatApi.UM_FindUser(si, Utf2T(dbei.szUserId))) - sRemoteUser = pUser->pszNick; nFirstColumnWidth = max(sRemoteUser.size(), clFileTo1ColWidth[sFilePath]); nFirstColumnWidth = max(sLocalUser.size(), nFirstColumnWidth); @@ -704,6 +700,11 @@ static bool ExportDBEventInfo(MCONTACT hContact, HANDLE hFile, const wstring &sF return true; } + if (dbei.szUserId && Contact::IsGroupChat(hContact)) + if (auto *si = Chat_Find(hContact, szProto)) + if (auto *pUser = g_chatApi.UM_FindUser(si, Utf2T(dbei.szUserId))) + sRemoteUser = pUser->pszNick; + // Get time stamp int nIndent = mir_snwprintf(szTemp, L"%-*s", (int)nFirstColumnWidth, dbei.flags & DBEF_SENT ? sLocalUser.c_str() : sRemoteUser.c_str()); -- cgit v1.2.3