ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't load data from invalid indices in MessageFilterModel

Browse Source
This commit is contained in:
Tobias Fella
2023-08-30 00:20:47 +02:00
parent dacf3ff8a0
commit e40179f641
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/models/messagefiltermodel.cpp
View File

@@ -54,8 +54,9 @@ bool MessageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sour
// Don't show state events that are not the first in a consecutive group on the // Don't show state events that are not the first in a consecutive group on the
// same day as they will be grouped as a single delegate. // same day as they will be grouped as a single delegate.
const bool notLastRow = sourceRow < sourceModel()->rowCount() - 1; const bool notLastRow = sourceRow < sourceModel()->rowCount() - 1;
const bool previousEventIsState = const bool previousEventIsState = notLastRow
sourceModel()->data(sourceModel()->index(sourceRow + 1, 0), MessageEventModel::DelegateTypeRole) == MessageEventModel::DelegateType::State; ? sourceModel()->data(sourceModel()->index(sourceRow + 1, 0), MessageEventModel::DelegateTypeRole) == MessageEventModel::DelegateType::State
: false;
const bool newDay = sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageEventModel::ShowSectionRole).toBool(); const bool newDay = sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageEventModel::ShowSectionRole).toBool();
if (eventType == MessageEventModel::State && notLastRow && previousEventIsState && !newDay) { if (eventType == MessageEventModel::State && notLastRow && previousEventIsState && !newDay) {
return false; return false;