From bdd133309dba5e9cc1faafa59820b3fee7fb51e0 Mon Sep 17 00:00:00 2001
From: hristoterezov <hristo@jitsi.org>
Date: Tue, 18 Apr 2017 10:35:14 -0500
Subject: [PATCH] fix(conference): Change display name when ChatRoom is not
 created yet

---
 conference.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/conference.js b/conference.js
index 22ce06cc1..dee5fc887 100644
--- a/conference.js
+++ b/conference.js
@@ -2048,8 +2048,9 @@ export default {
         }
 
         APP.settings.setDisplayName(formattedNickname);
-        room.setDisplayName(formattedNickname);
-        APP.UI.changeDisplayName(this.getMyUserId(),
-            formattedNickname);
+        if (room) {
+            room.setDisplayName(formattedNickname);
+            APP.UI.changeDisplayName(this.getMyUserId(), formattedNickname);
+        }
     }
 };