diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-02-01 08:44:50 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-02-01 08:44:50 -0800 |
| commit | 2487d561cd84eeb17c757bb4ee86ff007820da62 (patch) | |
| tree | 20c0df8771d070df187d6b403302e7c91ad315b6 /web/react/components/navbar.jsx | |
| parent | 1006e99859d65094d2a7818781faa47bf2eab2a5 (diff) | |
| parent | 1543be8a06748d1b191c5806661844fcee7678c8 (diff) | |
| download | chat-2487d561cd84eeb17c757bb4ee86ff007820da62.tar.gz chat-2487d561cd84eeb17c757bb4ee86ff007820da62.tar.bz2 chat-2487d561cd84eeb17c757bb4ee86ff007820da62.zip | |
Merge branch 'master' into fix-email
Diffstat (limited to 'web/react/components/navbar.jsx')
| -rw-r--r-- | web/react/components/navbar.jsx | 8 |
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; } } } |