From 30adefed074f5abd5ae86df9a6fd39479190de8d Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 17 Jul 2018 18:25:12 +0200
Subject: [PATCH] return sentinels with userid if members haven't been loaded
 yet,

better than braking timeline continuation
---
 src/models/room-state.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/models/room-state.js b/src/models/room-state.js
index c2f0198a8..bd9651977 100644
--- a/src/models/room-state.js
+++ b/src/models/room-state.js
@@ -118,12 +118,11 @@ RoomState.prototype.getSentinelMember = function(userId) {
     let sentinel = this._sentinels[userId];
 
     if (sentinel === undefined) {
+        sentinel = new RoomMember(this.roomId, userId);
         const member = this.members[userId];
-        if (!member) {
-            return null;
+        if (member) {
+            Object.assign(sentinel, member);
         }
-        sentinel = new RoomMember();
-        Object.assign(sentinel, member);
         this._sentinels[userId] = sentinel;
     }
     return sentinel;