summaryrefslogtreecommitdiffstats
path: root/app/channel.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-05-24 09:42:35 -0400
committerGitHub <noreply@github.com>2017-05-24 09:42:35 -0400
commitb84891f654583f5ded287e1f5aa5de3c32be5044 (patch)
tree47b8425757226c652d74fb14ef86e169494b0d92 /app/channel.go
parent751469979aefd6575174ea17ae13fca7c727ecfd (diff)
downloadchat-b84891f654583f5ded287e1f5aa5de3c32be5044.tar.gz
chat-b84891f654583f5ded287e1f5aa5de3c32be5044.tar.bz2
chat-b84891f654583f5ded287e1f5aa5de3c32be5044.zip
Only update status when clicking onto app (#6435)
Diffstat (limited to 'app/channel.go')
-rw-r--r--app/channel.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/channel.go b/app/channel.go
index bd9acaa6d..84be8557b 100644
--- a/app/channel.go
+++ b/app/channel.go
@@ -1041,7 +1041,7 @@ func SetActiveChannel(userId string, channelId string) *model.AppError {
} else {
oldStatus = status.Status
status.ActiveChannel = channelId
- if !status.Manual {
+ if !status.Manual && channelId != "" {
status.Status = model.STATUS_ONLINE
}
status.LastActivityAt = model.GetMillis()