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

Merge pull request #2133 from matrix-org/dbkr/dont_crash_if_room_tag_value_null 

Don't crash if the value of a room tag is null
pull/21833/head
David Baker 2018-08-23 14:05:44 +01:00 committed by GitHub
parent 7190fa301d cc08179b5d
commit ee4df85937
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/stores/RoomListStore.js
View File

@ -284,8 +284,8 @@ class RoomListStore extends Store {
if (optimisticRequest && roomB === optimisticRequest.room) metaB = optimisticRequest.metaData; if (optimisticRequest && roomB === optimisticRequest.room) metaB = optimisticRequest.metaData;
// Make sure the room tag has an order element, if not set it to be the bottom // Make sure the room tag has an order element, if not set it to be the bottom
const a = metaA.order; const a = metaA ? metaA.order : undefined;
const b = metaB.order; const b = metaB ? metaB.order : undefined;
// Order undefined room tag orders to the bottom // Order undefined room tag orders to the bottom
if (a === undefined && b !== undefined) { if (a === undefined && b !== undefined) {