Matrix: its all so tiresome

1 files changed, 2 insertions, 5 deletions

diff --git a/src/plugins/Matrix.cpp b/src/plugins/Matrix.cpp
index 50a2cd4..f97f574 100644
--- a/src/plugins/Matrix.cpp
+++ b/src/plugins/Matrix.cpp
@@ -500,19 +500,16 @@ namespace QuickMedia {
     }
 
     void MatrixQuickMedia::update_room_description(RoomData *room, Messages &new_messages, bool is_initial_sync, bool sync_is_cache) {
-        time_t read_marker_message_timestamp = 0;
+        time_t read_marker_message_timestamp = room->last_read_message_timestamp;
         std::shared_ptr<UserInfo> me = matrix->get_me(room);
         std::string my_user_read_marker;
-        if(me) {
+        if(me && read_marker_message_timestamp == 0) {
             my_user_read_marker = room->get_user_read_marker(me);
             auto read_marker_message = room->get_message_by_id(my_user_read_marker);
             if(read_marker_message)
                 read_marker_message_timestamp = read_marker_message->timestamp;
         }
 
-        if(read_marker_message_timestamp == 0)
-            read_marker_message_timestamp = room->last_read_message_timestamp;
-
         std::shared_ptr<Message> last_new_message = get_last_message_by_timestamp(new_messages);
         if(!last_new_message)
             return;