d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't delete messages received out of order (fixup the flickering fix)

Browse source
This commit is contained in:
Nicolas Werner 2020-02-16 18:58:38 +01:00
parent ec9da9f42a
commit 65bd099372
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/timeline/TimelineModel.cpp
View file

@ -148,19 +148,9 @@ TimelineModel::TimelineModel(TimelineViewManager *manager, QString room_id, QObj
connect(this, &TimelineModel::messageSent, this, [this](QString txn_id, QString event_id) { connect(this, &TimelineModel::messageSent, this, [this](QString txn_id, QString event_id) {
pending.removeOne(txn_id); pending.removeOne(txn_id);
// we could have received the message via sync
if (events.contains(event_id)) {
int idx = idToIndex(event_id);
if (idx >= 0) {
beginRemoveRows(QModelIndex(), idx, idx);
eventOrder.erase(eventOrder.begin() + idx);
endRemoveRows();
}
}
int idx = idToIndex(txn_id); int idx = idToIndex(txn_id);
if (idx < 0) { if (idx < 0) {
nhlog::ui()->warn("Sent index out of range"); // transaction already received via sync
return; return;
} }
eventOrder[idx] = event_id; eventOrder[idx] = event_id;