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

2018-07-16 12:33:19 +00:00
parent 33b6d0ab5f 415eef5aec
commit f76d9a7a97
1 changed files with 4 additions and 4 deletions
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -299,11 +299,11 @@ module.exports = React.createClass({
                        throw err;
                    }
                });
+            } else if (room) {
+                // Stop peeking because we have joined this room previously
+                MatrixClientPeg.get().stopPeeking();
+                this.setState({isPeeking: false});
            }
-        } else if (room) {
-            // Stop peeking because we have joined this room previously
-            MatrixClientPeg.get().stopPeeking();
-            this.setState({isPeeking: false});
        }
    },