From 65bd0993729deaa167c11daedcae65feb8bdf95a Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Sun, 16 Feb 2020 18:58:38 +0100
Subject: [PATCH] Don't delete messages received out of order (fixup the
flickering fix)
---
src/timeline/TimelineModel.cpp | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 432cd329f..004da9d0f 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -148,19 +148,9 @@ TimelineModel::TimelineModel(TimelineViewManager *manager, QString room_id, QObj
connect(this, &TimelineModel::messageSent, this, [this](QString txn_id, QString event_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);
if (idx < 0) {
- nhlog::ui()->warn("Sent index out of range");
+ // transaction already received via sync
return;
}
eventOrder[idx] = event_id;
--
GitLab