From 2769e6dfd3c3db280f40c1a09e0edbcee355045d Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 17 Jan 2023 16:48:01 +0300
Subject: grrm...

---
 protocols/Telegram/src/avatars.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'protocols/Telegram/src')

diff --git a/protocols/Telegram/src/avatars.cpp b/protocols/Telegram/src/avatars.cpp
index a322e9fb11..a4c841f3f5 100644
--- a/protocols/Telegram/src/avatars.cpp
+++ b/protocols/Telegram/src/avatars.cpp
@@ -85,15 +85,17 @@ void CTelegramProto::ProcessFile(TD::updateFile *pObj)
 
 		for (auto &it : m_arUsers) {
 			if (it->szAvatarHash == pFile->remote_->unique_id_.c_str()) {
-				CMStringW wszAvatarPath(GetAvatarFilename(it->hContact));
+				Utf2T wszExistingFile(pFile->local_->path_.c_str());
 				
 				PROTO_AVATAR_INFORMATION pai;
 				pai.hContact = it->hContact;
-				pai.format = ProtoGetAvatarFileFormat(pai.filename);
+				pai.format = ProtoGetAvatarFileFormat(wszExistingFile);
+				setByte(pai.hContact, DBKEY_AVATAR_TYPE, pai.format);
+
+				CMStringW wszAvatarPath(GetAvatarFilename(it->hContact));
 				wcsncpy_s(pai.filename, wszAvatarPath, _TRUNCATE);
 
-				setByte(pai.hContact, DBKEY_AVATAR_TYPE, pai.format);
-				MoveFileW(Utf2T(pFile->local_->path_.c_str()), wszAvatarPath);
+				MoveFileW(wszExistingFile, wszAvatarPath);
 
 				ProtoBroadcastAck(it->hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, &pai);
 				break;
-- 
cgit v1.2.3