From 9d45fb3bd79a2d81d8d95b2ee50c1d1a74e14b54 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 14 Nov 2023 12:46:28 +0300
Subject: NewStory: fix for unknown events in group chats

---
 src/mir_app/src/chat_manager.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/mir_app/src/chat_manager.cpp b/src/mir_app/src/chat_manager.cpp
index 589c03610d..1f6efed99e 100644
--- a/src/mir_app/src/chat_manager.cpp
+++ b/src/mir_app/src/chat_manager.cpp
@@ -195,11 +195,13 @@ LOGINFO* SM_AddEvent(SESSION_INFO *si, GCEVENT *gce, bool bIsHighlighted)
 
 	LOGINFO *li = new LOGINFO(gce);
 	li->bIsHighlighted = bIsHighlighted;
-	if (si->pMI->bDatabase && gce->hEvent) {
+	if (si->pMI->bDatabase) {
 		li->hEvent = gce->hEvent;
-		if (si->arEvents.find(li)) {
-			delete li;
-			return nullptr;
+		if (gce->hEvent) {
+			if (si->arEvents.find(li)) {
+				delete li;
+				return nullptr;
+			}
 		}
 	}
 	else li->hEvent = si->iLastEvent++;
-- 
cgit v1.2.3