Fix blank unread count query

mattermost · Feb 17, 2017 · 93522f7 · 93522f7
1 parent 9eef4fc
commit 93522f7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/api/channel.go b/api/channel.go
@@ -1297,7 +1297,7 @@ func viewChannel(c *Context, w http.ResponseWriter, r *http.Request) {
 	if len(view.PrevChannelId) > 0 {
 		channelIds = append(channelIds, view.PrevChannelId)
 
-		if *utils.Cfg.EmailSettings.SendPushNotifications && !c.Session.IsMobileApp() {
+		if *utils.Cfg.EmailSettings.SendPushNotifications && !c.Session.IsMobileApp() && len(view.ChannelId) > 0 {
 			pchan = Srv.Store.User().GetUnreadCountForChannel(c.Session.UserId, view.ChannelId)
 		}
 	}