diff options
| author | enahum <nahumhbl@gmail.com> | 2016-12-26 11:28:40 -0300 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-12-26 09:28:40 -0500 |
| commit | 47581e696492566684620b42a7ad476ec5f4c323 (patch) | |
| tree | b2684f433122d72e0a245964b5cd1362acac48cb /webapp | |
| parent | 0a1b0d051a1a7d83ad01502f8073d35ee5da95cc (diff) | |
| download | chat-47581e696492566684620b42a7ad476ec5f4c323.tar.gz chat-47581e696492566684620b42a7ad476ec5f4c323.tar.bz2 chat-47581e696492566684620b42a7ad476ec5f4c323.zip | |
Fix error after leaving team (#4888)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/actions/websocket_actions.jsx | 1 | ||||
| -rw-r--r-- | webapp/utils/async_client.jsx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx index 63f2c535a..d03025efb 100644 --- a/webapp/actions/websocket_actions.jsx +++ b/webapp/actions/websocket_actions.jsx @@ -223,6 +223,7 @@ function handleLeaveTeamEvent(msg) { if (TeamStore.getCurrentId() === msg.data.team_id) { TeamStore.setCurrentId(''); Client.setTeamId(''); + BrowserStore.removeGlobalItem('team'); BrowserStore.removeGlobalItem(msg.data.team_id); GlobalActions.redirectUserToDefaultTeam(); } diff --git a/webapp/utils/async_client.jsx b/webapp/utils/async_client.jsx index 66f13f04d..25724ec5e 100644 --- a/webapp/utils/async_client.jsx +++ b/webapp/utils/async_client.jsx @@ -139,7 +139,7 @@ export function getMyChannelMembers() { } export function viewChannel(channelId = ChannelStore.getCurrentId(), prevChannelId = '', time = 0) { - if (channelId == null) { + if (channelId == null || !Client.teamId) { return; } |