From f0919f5b6827a7965a89b287feee0693b3c7560b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 5 Sep 2023 12:34:11 +0300 Subject: =?UTF-8?q?fixes=20#3669=20(NewStory:=20=D0=BE=D0=BF=D1=86=D0=B8?= =?UTF-8?q?=D1=8F=20"=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D1=82=D1=8C=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F"=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B8?= =?UTF-8?q?=D1=80=D1=83=D0=B5=D1=82=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=B5=20?= =?UTF-8?q?=D1=81=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D1=8F=D0=BC=D0=B8?= =?UTF-8?q?=20=D0=B2=D1=85=D0=BE=D0=B4=D0=B0=20=D0=B2=20=D1=87=D0=B0=D1=82?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/NewStory/src/history_array.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'plugins/NewStory/src/history_array.cpp') diff --git a/plugins/NewStory/src/history_array.cpp b/plugins/NewStory/src/history_array.cpp index 2b2babe744..aaf1295707 100644 --- a/plugins/NewStory/src/history_array.cpp +++ b/plugins/NewStory/src/history_array.cpp @@ -103,6 +103,9 @@ ItemData* ItemData::checkPrev(ItemData *pPrev) static bool isEqualGC(const ItemData *p1, const ItemData *p2) { + if (p1->dbe.eventType != p2->dbe.eventType) + return false; + if (!p1->wszNick || !p2->wszNick) return false; @@ -382,7 +385,7 @@ void HistoryArray::addChatEvent(SESSION_INFO *si, const LOGINFO *lin) if (si == nullptr) return; - if (lin->hEvent) { + if (si->pMI->bDatabase && lin->hEvent) { addEvent(si->hContact, lin->hEvent, 1); return; } -- cgit v1.2.3