Merge pull request element-hq#997 from vector-im/dbkr/fix_new_room_crash

dbkr · dbkr · commit acb443537a6f · 2016-02-23T18:12:42.000Z
Sender can be null, so null check.
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
@@ -119,7 +119,7 @@ var RoomSubList = React.createClass({
         for (var i = room.timeline.length - 1; i >= 0; --i) {
             var ev = room.timeline[i];
             if (Unread.eventTriggersUnreadCount(ev) ||
-                ev.sender.userId === MatrixClientPeg.get().credentials.userId)
+                (ev.sender && ev.sender.userId === MatrixClientPeg.get().credentials.userId))
             {
                 return ev.getTs();
             }

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ var RoomSubList = React.createClass({`
`119`	`119`	`for (var i = room.timeline.length - 1; i >= 0; --i) {`
`120`	`120`	`var ev = room.timeline[i];`
`121`	`121`	`if (Unread.eventTriggersUnreadCount(ev) \|\|`
`122`		`- ev.sender.userId === MatrixClientPeg.get().credentials.userId)`
	`122`	`+ (ev.sender && ev.sender.userId === MatrixClientPeg.get().credentials.userId))`
`123`	`123`	`{`
`124`	`124`	`return ev.getTs();`
`125`	`125`	`}`