summaryrefslogtreecommitdiff
path: root/protocols/ICQ-WIM/src/menus.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2023-12-19 15:25:41 +0300
committerGeorge Hazan <george.hazan@gmail.com>2023-12-19 15:25:41 +0300
commit19acd0ef59d7272db67ef54b331f32103dbd5aad (patch)
treeb5207c96b23ff65d3f929882dbe61046864bc916 /protocols/ICQ-WIM/src/menus.cpp
parent8bab65e5e51df9f5c70f9fd6d7e3fdb0771c37e9 (diff)
fixes #4071 (NewStory: Convert message to a file transfer не срабатывает в сообщениях, содержащих и файл и текст)
Diffstat (limited to 'protocols/ICQ-WIM/src/menus.cpp')
-rw-r--r--protocols/ICQ-WIM/src/menus.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/protocols/ICQ-WIM/src/menus.cpp b/protocols/ICQ-WIM/src/menus.cpp
index ddfa5f0745..4cb75fe7b0 100644
--- a/protocols/ICQ-WIM/src/menus.cpp
+++ b/protocols/ICQ-WIM/src/menus.cpp
@@ -48,18 +48,18 @@ INT_PTR CIcqProto::SvcExecMenu(WPARAM iCommand, LPARAM pHandle)
IcqFileInfo *pFileInfo = nullptr;
CMStringW wszText(ptrW(DbEvent_GetTextW(&dbei, CP_UTF8)));
if (CheckFile(db_event_getContact(hEvent), wszText, pFileInfo)) {
- if (pFileInfo->bIsSticker) {
+ if (!pFileInfo || pFileInfo->bIsSticker) {
// sticker is a simple text message prcoessed by SmileyAdd
T2Utf szBody(wszText);
mir_free(dbei.pBlob);
- dbei.pBlob = (uint8_t*)szBody.get();
dbei.cbBlob = (int)mir_strlen(szBody.get());
+ dbei.pBlob = (uint8_t*)szBody.detach();
}
else {
// create the offline file event
dbei.eventType = EVENTTYPE_FILE;
- DB::FILE_BLOB blob(pFileInfo->wszDescr, L"");
+ DB::FILE_BLOB blob(pFileInfo->wszDescr, wszText);
blob.setUrl(pFileInfo->szOrigUrl);
blob.setSize(pFileInfo->dwFileSize);
blob.write(dbei);