From 81385232b3d343a4ee73efa3a742a38e48be386b Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 26 Feb 2024 12:21:04 +0300
Subject: fixes #4235 (tabSRMM: problems with cyrillic letters in Template
 Editor preview window)

---
 plugins/TabSRMM/src/msglog.cpp     | 4 ++--
 plugins/TabSRMM/src/msgoptions.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins/TabSRMM/src')

diff --git a/plugins/TabSRMM/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp
index 9dcefa28aa..d2e55696f1 100644
--- a/plugins/TabSRMM/src/msglog.cpp
+++ b/plugins/TabSRMM/src/msglog.cpp
@@ -575,7 +575,7 @@ bool CLogWindow::CreateRtfEvent(RtfLogStreamData *streamData, DB::EventInfo &dbe
 
 	CMStringW msg(ptrW(DbEvent_GetTextW(&dbei)));
 	if (msg.IsEmpty())
-		return nullptr;
+		return false;
 
 	msg.TrimRight();
 	dat->FormatRaw(msg, 1, FALSE);
@@ -1117,7 +1117,7 @@ skip:
 
 	dat->m_iLastEventType = MAKELONG((dbei.flags & (DBEF_SENT | DBEF_READ | DBEF_RTL)), dbei.eventType);
 	dat->m_lastEventTime = dbei.timestamp;
-	return str.Detach();
+	return true;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index 5083b0d49e..c9d72a823d 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -632,7 +632,7 @@ public:
 			dbei.szModule = (char *)TranslateT("Sample error message");
 		dbei.pBlob = szText;
 		dbei.cbBlob = (int)mir_strlen((char *)dbei.pBlob);
-		dbei.flags = (iIndex == 1 || iIndex == 3 || iIndex == 5) ? DBEF_SENT : 0;
+		dbei.flags = DBEF_UTF | ((iIndex == 1 || iIndex == 3 || iIndex == 5) ? DBEF_SENT : 0);
 		dbei.flags |= (m_bRtl ? DBEF_RTL : 0);
 		m_lastEventTime = (iIndex == 4 || iIndex == 5) ? time(0) - 1 : 0;
 		m_iLastEventType = MAKELONG(dbei.flags, dbei.eventType);
-- 
cgit v1.2.3