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

Fix pending events not showing when the server event turns up

Browse Source
This commit is contained in:
James Graham
2024-08-17 11:54:30 +01:00
committed by Tobias Fella
parent 776807580a
commit 149013d2ff
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/models/messagecontentmodel.cpp
View File

@@ -80,7 +80,7 @@ void MessageContentModel::initializeModel()
connect(m_room, &NeoChatRoom::pendingEventAboutToMerge, this, [this](Quotient::RoomEvent *serverEvent) {
if (m_room != nullptr && m_event != nullptr) {
if (m_eventId == serverEvent->id()) {
if (m_eventId == serverEvent->id() || m_eventId == serverEvent->transactionId()) {
beginResetModel();
m_isPending = false;
intiializeEvent(serverEvent);