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

Merge pull request #2699 from matrix-org/travis/fix-bug-in-notifications 

Fix NPE relating to toggling notifications
pull/21833/head
Travis Ralston 2019-02-25 07:31:59 -07:00 committed by GitHub
parent 8049d5c2b2 6cc534e503
commit addc7e519b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/RoomView.js
View File

@ -537,12 +537,12 @@ module.exports = React.createClass({
case 'picture_snapshot': case 'picture_snapshot':
this.uploadFile(payload.file); this.uploadFile(payload.file);
break; break;
case 'notifier_enabled':
case 'upload_failed': case 'upload_failed':
// 413: File was too big or upset the server in some way. // 413: File was too big or upset the server in some way.
if(payload.error.http_status === 413) { if (payload.error && payload.error.http_status === 413) {
this._fetchMediaConfig(true); this._fetchMediaConfig(true);
} }
case 'notifier_enabled':
case 'upload_started': case 'upload_started':
case 'upload_finished': case 'upload_finished':
this.forceUpdate(); this.forceUpdate();