mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-08-22 06:51:21 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Weblate 2018-04-03 16:52:01 +00:00
commit 7ea67c03e7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/views/avatars/RoomAvatar.js
View File

@ -66,7 +66,8 @@ module.exports = React.createClass({
}, },
onRoomStateEvents: function(ev) { onRoomStateEvents: function(ev) {
if (ev.getRoomId() !== this.props.room.roomId || if (!this.props.room ||
ev.getRoomId() !== this.props.room.roomId ||
ev.getType() !== 'm.room.avatar' ev.getType() !== 'm.room.avatar'
) return; ) return;