Fix JS error when switching teams mid channel switch (#529)

mattermost · Jan 3, 2018 · fe473ad · fe473ad
1 parent 78d7617
commit fe473ad
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/utils/utils.jsx b/utils/utils.jsx
@@ -948,9 +948,10 @@ export function isMobile() {
 }
 
 export function getDirectTeammate(channelId) {
- var userIds = ChannelStore.get(channelId).name.split('__');
- var curUserId = UserStore.getCurrentId();
- var teammate = {};
+ const channel = ChannelStore.get(channelId) || {};
+ const userIds = channel.name.split('__');
+ const curUserId = UserStore.getCurrentId();
+ let teammate = {};
 
  if (userIds.length !== 2 || userIds.indexOf(curUserId) === -1) {
  return teammate;