From e829f867c14cb51e89e4d10550f2f41329c14ba8 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Mon, 9 Dec 2019 11:52:26 +0300
Subject: Initialise read marker if none is found in the whole timeline

Closes #361.
---
 lib/room.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/room.cpp b/lib/room.cpp
index 71d76f66..8253ea42 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -515,7 +515,9 @@ void Room::Private::updateUnreadCount(rev_iter_t from, rev_iter_t to)
     // that has just arrived. In this case we should recalculate
     // unreadMessages and might need to promote the read marker further
     // over local-origin messages.
-    const auto readMarker = q->readMarker();
+    auto readMarker = q->readMarker();
+    if (readMarker == timeline.crend() && q->allHistoryLoaded())
+        --readMarker; // Read marker not found in the timeline, initialise it
     if (readMarker >= from && readMarker < to) {
         promoteReadMarker(q->localUser(), readMarker, true);
         return;
-- 
cgit v1.2.3