Merge remote-tracking branch 'origin/develop' into develop

2018-06-26 16:15:25 +00:00
parent d91730d930 10e39d5a5d
commit 0724a033a6
1 changed files with 2 additions and 0 deletions
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -147,6 +147,8 @@ class RoomViewStore extends Store {
                joining: payload.joining || false,
                // Reset replyingToEvent because we don't want cross-room because bad UX
                replyingToEvent: null,
+                // pull the user out of Room Settings
+                isEditingSettings: false,
            };

            if (this._state.forwardingEvent) {