Merge pull request #3009 from matrix-org/jryans/decrypt-null-room
Guard against null rooms in `onEventDecrypted`
This commit is contained in:
commit
a79dd43f2d
1 changed files with 3 additions and 0 deletions
|
@ -556,6 +556,9 @@ const TimelinePanel = React.createClass({
|
||||||
},
|
},
|
||||||
|
|
||||||
onEventDecrypted: function(ev) {
|
onEventDecrypted: function(ev) {
|
||||||
|
// Can be null for the notification timeline, etc.
|
||||||
|
if (!this.props.timelineSet.room) return;
|
||||||
|
|
||||||
// Need to update as we don't display event tiles for events that
|
// Need to update as we don't display event tiles for events that
|
||||||
// haven't yet been decrypted. The event will have just been updated
|
// haven't yet been decrypted. The event will have just been updated
|
||||||
// in place so we just need to re-render.
|
// in place so we just need to re-render.
|
||||||
|
|
Loading…
Reference in a new issue