summaryrefslogtreecommitdiffstats
path: root/webapp/actions
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-11-21 16:48:27 -0500
committerGitHub <noreply@github.com>2016-11-21 16:48:27 -0500
commitfd019eefbb7c2130d711718bda5efb3e3d4ce8aa (patch)
tree56eed8195fb224cb5fe6a44c6e7ce81dff1054ae /webapp/actions
parent3c0f8c29db3d5cc5901b1e30710f1b900980920a (diff)
downloadchat-fd019eefbb7c2130d711718bda5efb3e3d4ce8aa.tar.gz
chat-fd019eefbb7c2130d711718bda5efb3e3d4ce8aa.tar.bz2
chat-fd019eefbb7c2130d711718bda5efb3e3d4ce8aa.zip
Fixed error logged when joining a team from another tab (#4620)
Diffstat (limited to 'webapp/actions')
-rw-r--r--webapp/actions/websocket_actions.jsx5
1 files changed, 5 insertions, 0 deletions
diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx
index b61d039af..60ed44fc9 100644
--- a/webapp/actions/websocket_actions.jsx
+++ b/webapp/actions/websocket_actions.jsx
@@ -211,6 +211,11 @@ function handleNewUserEvent(msg) {
return;
}
+ if (msg.data.user_id === UserStore.getCurrentId()) {
+ // We should already have ourselves
+ return;
+ }
+
AsyncClient.getUser(msg.data.user_id);
AsyncClient.getChannelStats();
loadProfilesAndTeamMembersForDMSidebar();