From b84891f654583f5ded287e1f5aa5de3c32be5044 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Wed, 24 May 2017 09:42:35 -0400 Subject: Only update status when clicking onto app (#6435) --- app/channel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/channel.go') 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() -- cgit v1.2.3-1-g7c22