diff options
| author | George Hazan <george.hazan@gmail.com> | 2023-09-05 12:34:11 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2023-09-05 12:34:11 +0300 |
| commit | f0919f5b6827a7965a89b287feee0693b3c7560b (patch) | |
| tree | 460a853fea27bc4f787386a32715f3aea5188561 /plugins/NewStory/src/history_array.cpp | |
| parent | c2be50463ef2bf47f376bf9180f1aab81081c76d (diff) | |
fixes #3669 (NewStory: опция "группировать сообщения" группирует сообщения вместе с событиями входа в чат)
Diffstat (limited to 'plugins/NewStory/src/history_array.cpp')
| -rw-r--r-- | plugins/NewStory/src/history_array.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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; } |