diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-04-17 15:08:56 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-04-17 15:08:56 -0400 |
| commit | 92d8fa4aa8af170d0018baed94a8787d06297e44 (patch) | |
| tree | dc5000a3584952c797c03bf4331282a5e1536848 /webapp/actions/channel_actions.jsx | |
| parent | 742bab6429aeb1b581275da3c06af99fe293baab (diff) | |
| parent | 30974533941e73f102505d07badf538cfdbbf3fc (diff) | |
| download | chat-92d8fa4aa8af170d0018baed94a8787d06297e44.tar.gz chat-92d8fa4aa8af170d0018baed94a8787d06297e44.tar.bz2 chat-92d8fa4aa8af170d0018baed94a8787d06297e44.zip | |
Merge branch 'release-3.8'
Diffstat (limited to 'webapp/actions/channel_actions.jsx')
| -rw-r--r-- | webapp/actions/channel_actions.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/actions/channel_actions.jsx b/webapp/actions/channel_actions.jsx index 3f4ab210d..d441a0e94 100644 --- a/webapp/actions/channel_actions.jsx +++ b/webapp/actions/channel_actions.jsx @@ -300,7 +300,7 @@ export function loadDMsAndGMsForUnreads() { if (unreads[id].msgs > 0 || unreads[id].mentions > 0) { const channel = ChannelStore.get(id); if (channel && channel.type === Constants.DM_CHANNEL) { - loadNewDMIfNeeded(Utils.getUserIdFromChannelName(channel)); + loadNewDMIfNeeded(channel.id); } else if (channel && channel.type === Constants.GM_CHANNEL) { loadNewGMIfNeeded(channel.id); } |