From 9bf8f37e5f2ed43e1922febf544715eef9b3e3c2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 8 Feb 2016 16:03:04 +0000
Subject: [PATCH] explicitly check join status as it's clearer

---
 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 5fc9cc74e2..be77a22101 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -715,8 +715,8 @@ module.exports = React.createClass({
         // it doesn't behave quite as desired here (we want an input field here rather than
         // content-editable, and we want a default).
         if (cli.getRooms().filter((r) => {
-            return !!r.getMember(cli.credentials.userId);
-        }).length == 0) {
+            return r.hasMembershipState(cli.credentials.userId, "join");
+        })) {
             display_name_promise = cli.getProfileInfo(cli.credentials.userId).then((result) => {
                 if (!result.displayname) {
                     var SetDisplayNameDialog = sdk.getComponent('views.dialogs.SetDisplayNameDialog');