From f52035f3cd7aa63db1a3c56ef23af16092dce868 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 2 Jun 2017 13:41:41 +0100
Subject: [PATCH] Set state from dispatch payload unconditionally

As apparently doing it confitionally is bad
---
 src/stores/RoomViewStore.js | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index b0957ec3df..6ba0e45f68 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -158,20 +158,16 @@ class RoomViewStore extends Store {
     }
 
     _joinedRoom(payload) {
-        if (payload.room_id === this._state.roomId) {
-            this._setState({
-                joining: false,
-            });
-        }
+        this._setState({
+            joining: false,
+        });
     }
 
     _joinRoomError(payload) {
-        if (payload.room_id === this._state.roomId) {
-            this._setState({
-                joining: false,
-                joinError: payload.err,
-            });
-        }
+        this._setState({
+            joining: false,
+            joinError: payload.err,
+        });
     }
 
     reset() {