summaryrefslogtreecommitdiff
path: root/plugins/Msg_Export/src
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2024-05-30 14:05:40 +0300
committerGeorge Hazan <george.hazan@gmail.com>2024-05-30 14:05:40 +0300
commitc104cf6c15af38f5b9b6946f08d90e5eef579507 (patch)
tree455eb8787cc5b198338ea8e790bf906a1f7e0d80 /plugins/Msg_Export/src
parent98d38b5b18a0552649ccde10e438690ad1b7d9e2 (diff)
fixes #4279 (Msg_Export: некорректно экспортируется история чатов Telegram)
Diffstat (limited to 'plugins/Msg_Export/src')
-rw-r--r--plugins/Msg_Export/src/export.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/Msg_Export/src/export.cpp b/plugins/Msg_Export/src/export.cpp
index 1d53c39269..ca2b9e108a 100644
--- a/plugins/Msg_Export/src/export.cpp
+++ b/plugins/Msg_Export/src/export.cpp
@@ -297,9 +297,12 @@ static bool ExportDBEventInfo(MCONTACT hContact, HANDLE hFile, const wstring &sF
}
if (dbei.szUserId && Contact::IsGroupChat(hContact))
- if (auto *si = Chat_Find(hContact, szProto))
+ if (auto *si = Chat_Find(hContact, szProto)) {
if (auto *pUser = g_chatApi.UM_FindUser(si, Utf2T(dbei.szUserId)))
sRemoteUser = pUser->pszNick;
+ else
+ sRemoteUser = Utf2T(dbei.szUserId);
+ }
// Get time stamp
CMStringW output;
@@ -325,7 +328,7 @@ static bool ExportDBEventInfo(MCONTACT hContact, HANDLE hFile, const wstring &sF
{
DB::FILE_BLOB blob(dbei);
if (!blob.isCompleted())
- return false;
+ return true;
output.Append(L"File: ");
bWriteIndentedToFile(output, nIndent, blob.getName());