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
matrix-org · Aug 23, 2018 · ee4df85 · ee4df85
2 parents 7190fa3 + cc08179
commit ee4df85
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
@@ -284,8 +284,8 @@ class RoomListStore extends Store {
             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
-            const a = metaA.order;
-            const b = metaB.order;
+            const a = metaA ? metaA.order : undefined;
+            const b = metaB ? metaB.order : undefined;
 
             // Order undefined room tag orders to the bottom
             if (a === undefined && b !== undefined) {