OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3009 from matrix-org/jryans/decrypt-null-room 

Guard against null rooms in `onEventDecrypted`
pull/21833/head
J. Ryan Stinnett 2019-05-22 10:13:37 +01:00 committed by GitHub
parent 4b4d09266e 2648dbd221
commit a79dd43f2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/structures/TimelinePanel.js
View File

@ -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.