From 66aae3c929b110d9621c649ebaeba2e75dc2a1b9 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 18 Sep 2024 18:05:30 +0300
Subject: =?UTF-8?q?fixes=20#4682=20(Scriver:=20=D0=BF=D1=80=D0=BE=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B0=20=D0=BF=D0=BE=D0=B4=D1=81=D0=B2=D0=B5=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=81=D0=B2=D1=91=D1=80=D0=BD=D1=83=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B3=D0=BE=20=D0=BE=D0=BA=D0=BD=D0=B0=20=D0=B2=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BB=D0=B8=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mir_app/src/db_events.cpp | 15 +++++++++++----
 src/mir_app/src/mir_app.def   |  1 +
 src/mir_app/src/mir_app64.def |  1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/mir_app/src/db_events.cpp b/src/mir_app/src/db_events.cpp
index 4b8f32cc95..cadc794090 100644
--- a/src/mir_app/src/db_events.cpp
+++ b/src/mir_app/src/db_events.cpp
@@ -199,11 +199,18 @@ void DB::EventInfo::wipeNotify()
 	Clist_RemoveEvent(-1, m_hEvent);
 }
 
+// is a custom event of the specified type
+bool DB::EventInfo::isCustom(int iType) const
+{
+	auto *et = DbEvent_GetType(szModule, eventType);
+	return et && (et->flags & iType) != 0;
+}
+
 // could be displayed in a SRMM window
 bool DB::EventInfo::isSrmm() const
 {
-	if (auto *et = DbEvent_GetType(szModule, eventType))
-		return (et->flags & DETF_MSGWINDOW) != 0;
+	if (isCustom(DETF_MSGWINDOW))
+		return true;
 	
 	return (eventType == EVENTTYPE_MESSAGE || eventType == EVENTTYPE_FILE);
 }
@@ -211,8 +218,8 @@ bool DB::EventInfo::isSrmm() const
 // could be displayed in a history window
 bool DB::EventInfo::isHistory() const
 {
-	if (auto *et = DbEvent_GetType(szModule, eventType))
-		return (et->flags & DETF_HISTORY) != 0;
+	if (isCustom(DETF_HISTORY))
+		return true;
 
 	return (eventType == EVENTTYPE_MESSAGE || eventType == EVENTTYPE_FILE);
 }
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 975784af91..1a41fffe6a 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -987,3 +987,4 @@ _Proto_CanDeleteHistory@8 @1124 NONAME
 ?OnCacheInit@PROTO_INTERFACE@@UAEXXZ @1125 NONAME
 ?DoRtfToTags@CSrmmBaseDialog@@IBE_NAAV?$CMStringT@_WV?$ChTraitsCRT@_W@@@@@Z @1126 NONAME
 ?bUseGroup@Chat@@3V?$CMOption@_N@@A @1127 NONAME
+?isCustom@EventInfo@DB@@QBE_NH@Z @1128 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 26d32d197a..b884360513 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -987,3 +987,4 @@ Proto_CanDeleteHistory @1118 NONAME
 ?OnCacheInit@PROTO_INTERFACE@@UEAAXXZ @1119 NONAME
 ?DoRtfToTags@CSrmmBaseDialog@@IEBA_NAEAV?$CMStringT@_WV?$ChTraitsCRT@_W@@@@@Z @1120 NONAME
 ?bUseGroup@Chat@@3V?$CMOption@_N@@A @1121 NONAME
+?isCustom@EventInfo@DB@@QEBA_NH@Z @1122 NONAME
-- 
cgit v1.2.3