Merge branch 'develop' of https://github.com/bwmarrin/Discordgo into develop

This commit is contained in:
Bruce Marriner 2016-04-28 07:48:59 -05:00
commit df818b5931

View file

@ -325,6 +325,9 @@ func (s *State) Channel(channelID string) (*Channel, error) {
return nil, ErrNilState return nil, ErrNilState
} }
s.RLock()
defer s.RUnlock()
if c, ok := s.channelMap[channelID]; ok { if c, ok := s.channelMap[channelID]; ok {
return c, nil return c, nil
} }