Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only signal pending event as merged once the real one is in the timeline #844

Merged
merged 1 commit into from
Dec 9, 2024
Merged

Only signal pending event as merged once the real one is in the timeline #844

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Quotient/room.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2793,9 +2793,9 @@ Room::Timeline::size_type Room::Private::mergePendingEvent(PendingEvents::iterat
// unsyncedEvents (see #286). Fortunately, unsyncedEvents only grows at
// its back so we can rely on the index staying valid at least.
localEchoIt = unsyncedEvents.begin() + pendingEvtIdx;
const auto insertedSize = moveEventsToTimeline({ remoteEchoIt, remoteEchoIt + 1 }, Newer);
localEchoIt->setMerged(*remoteEcho);
unsyncedEvents.erase(localEchoIt);
const auto insertedSize = moveEventsToTimeline({ remoteEchoIt, remoteEchoIt + 1 }, Newer);
if (insertedSize > 0)
q->onAddNewTimelineEvents(syncEdge() - insertedSize);

Expand Down