summaryrefslogtreecommitdiffstats
path: root/web/react/components/navbar.jsx
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2016-02-01 08:01:49 -0500
committerJoramWilander <jwawilander@gmail.com>2016-02-01 08:01:49 -0500
commit12efe8675e5f0591308c10949174e64e42eb1f04 (patch)
tree197416e8072c45f5da6eddf8e98d0f0b93860f2d /web/react/components/navbar.jsx
parent0b022b130a6a4d4c3984fc7d021b2817b56480a1 (diff)
downloadchat-12efe8675e5f0591308c10949174e64e42eb1f04.tar.gz
chat-12efe8675e5f0591308c10949174e64e42eb1f04.tar.bz2
chat-12efe8675e5f0591308c10949174e64e42eb1f04.zip
Fix console errors
Diffstat (limited to 'web/react/components/navbar.jsx')
-rw-r--r--web/react/components/navbar.jsx8
1 files changed, 6 insertions, 2 deletions
diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx
index ae14fca2f..7326a9ef8 100644
--- a/web/react/components/navbar.jsx
+++ b/web/react/components/navbar.jsx
@@ -392,10 +392,14 @@ export default class Navbar extends React.Component {
} else if (channel.type === 'D') {
isDirect = true;
if (this.state.users.length > 1) {
+ let p;
if (this.state.users[0].id === currentId) {
- channelTitle = UserStore.getProfile(this.state.users[1].id).username;
+ p = UserStore.getProfile(this.state.users[1].id);
} else {
- channelTitle = UserStore.getProfile(this.state.users[0].id).username;
+ p = UserStore.getProfile(this.state.users[0].id);
+ }
+ if (p != null) {
+ channelTitle = p.username;
}
}
}