summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-11-01 14:28:37 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-11-01 14:28:37 -0400
commiteaaed77603f85e66e6afcca9311164ca3317213f (patch)
treece77842273f7406cc8f7c6d26ddb90f4175d858f /webapp
parent6a4d1713e666bf2d8d6ea10573d0b3b2a2959c62 (diff)
downloadchat-eaaed77603f85e66e6afcca9311164ca3317213f.tar.gz
chat-eaaed77603f85e66e6afcca9311164ca3317213f.tar.bz2
chat-eaaed77603f85e66e6afcca9311164ca3317213f.zip
PLT-4596 Stopped trying to get new users when not in a context with a team (#4411)
Diffstat (limited to 'webapp')
-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 55df5105f..c7010dcd4 100644
--- a/webapp/actions/websocket_actions.jsx
+++ b/webapp/actions/websocket_actions.jsx
@@ -199,6 +199,11 @@ function handlePostDeleteEvent(msg) {
}
function handleNewUserEvent(msg) {
+ if (TeamStore.getCurrentId() === '') {
+ // Any new users will be loaded when we switch into a context with a team
+ return;
+ }
+
AsyncClient.getUser(msg.data.user_id);
AsyncClient.getChannelStats();
loadProfilesAndTeamMembersForDMSidebar();