From 5c37d591b02bef6a860df21b0f93dc13b1cff87a Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 15 Jun 2017 13:35:19 +0100
Subject: [PATCH] Unbreak auto joining

---
 src/components/structures/RoomView.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 6f5b4bd46d..d05da63f54 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -231,10 +231,10 @@ module.exports = React.createClass({
             this._updateAutoComplete(room);
             this.tabComplete.loadEntries(room);
         }
-        if (!room && !this.state.joining && this.state.roomId) {
+        if (!this.state.joining && this.state.roomId) {
             if (this.props.autoJoin) {
                 this.onJoinButtonClicked();
-            } else {
+            } else if (!room) {
                 console.log("Attempting to peek into room %s", this.state.roomId);
                 this.setState({
                     peekLoading: true,