summaryrefslogtreecommitdiffstats
path: root/web/react/components/sidebar.jsx
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-10-07 11:39:45 -0400
committerJoramWilander <jwawilander@gmail.com>2015-10-07 11:39:45 -0400
commit1421e1ec4aa09c0e7094643d342d095cdd91d506 (patch)
tree80eac658b063f64c019dd71eaa6ac4bbb062d91e /web/react/components/sidebar.jsx
parentdfaef4bd7227391e21890c720f9668acb3a64c28 (diff)
downloadchat-1421e1ec4aa09c0e7094643d342d095cdd91d506.tar.gz
chat-1421e1ec4aa09c0e7094643d342d095cdd91d506.tar.bz2
chat-1421e1ec4aa09c0e7094643d342d095cdd91d506.zip
Fix user_added websocket event and update websocket channel access cache on add/remove member.
Diffstat (limited to 'web/react/components/sidebar.jsx')
-rw-r--r--web/react/components/sidebar.jsx2
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;
}