From 58554cce5376a39578667706d20db62cdef2669a Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 14 Jun 2017 17:13:13 +0100
Subject: [PATCH] Remove racey condition

joining might become false before we get the room down the sync
---
 src/components/structures/RoomView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 7313b2bc33..0cd8a95938 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -617,7 +617,7 @@ module.exports = React.createClass({
     },
 
     onRoom: function(room) {
-        if (!room || room.roomId !== this.state.roomId || !this.state.joining) {
+        if (!room || room.roomId !== this.state.roomId) {
             return;
         }
         this.setState({