diff options
| author | Corey Hulen <corey@hulen.com> | 2015-10-07 09:30:01 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-10-07 09:30:01 -0700 |
| commit | 3c859aebde2e9e11e8b1eeb4d8bb300400b4ad54 (patch) | |
| tree | e392637ecffed4e761ad5c59e4d6472e998132e6 /web | |
| parent | 5ac1a58063b9302f2ed88af2bbed0be850aa1666 (diff) | |
| parent | 1421e1ec4aa09c0e7094643d342d095cdd91d506 (diff) | |
| download | chat-3c859aebde2e9e11e8b1eeb4d8bb300400b4ad54.tar.gz chat-3c859aebde2e9e11e8b1eeb4d8bb300400b4ad54.tar.bz2 chat-3c859aebde2e9e11e8b1eeb4d8bb300400b4ad54.zip | |
Merge pull request #961 from mattermost/plt-471
PLT-471 Fix user_added websocket event
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/sidebar.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index b696f4b53..88eaed335 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -205,7 +205,7 @@ export default class Sidebar extends React.Component { const user = UserStore.getCurrentUser(); const member = ChannelStore.getMember(msg.channel_id); - var notifyLevel = member.notify_props.desktop; + var notifyLevel = member && member.notify_props ? member.notify_props.desktop : 'default'; if (notifyLevel === 'default') { notifyLevel = user.notify_props.desktop; } |