summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-02-16 09:38:24 -0500
committerCorey Hulen <corey@hulen.com>2017-02-16 09:38:24 -0500
commit8f262241595cc9377e4c3adce9c728eaff38c5f3 (patch)
tree59157434c5cca77769fc181e6ca963bbb2abd2c3 /webapp
parentc8cbc3f0f33600ff93cfd97b85082e75e843a28e (diff)
downloadchat-8f262241595cc9377e4c3adce9c728eaff38c5f3.tar.gz
chat-8f262241595cc9377e4c3adce9c728eaff38c5f3.tar.bz2
chat-8f262241595cc9377e4c3adce9c728eaff38c5f3.zip
Fix JS error on joining some channels (#5439)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/routes/route_team.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/routes/route_team.jsx b/webapp/routes/route_team.jsx
index 44a8c1eb6..b4d9e068a 100644
--- a/webapp/routes/route_team.jsx
+++ b/webapp/routes/route_team.jsx
@@ -34,7 +34,7 @@ function doChannelChange(state, replace, callback) {
} else {
channel = ChannelStore.getByName(state.params.channel);
- if (channel.type === Constants.DM_CHANNEL) {
+ if (channel && channel.type === Constants.DM_CHANNEL) {
loadNewDMIfNeeded(Utils.getUserIdFromChannelName(channel));
}