pothtonswer/discordmuffin
1
0
Fork 1
Code Issues 2 Pull requests 1 Projects 2 Releases Packages Wiki Activity Actions

Merge pull request #157 from iopred/develop

Browse source 
Fix potential infinite loop on state.
This commit is contained in:
Bruce 2016-04-01 13:37:03 -05:00
commit b2427516da
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
state.go
View file

@ -12,10 +12,7 @@
package discordgo package discordgo
import ( import "errors"
"errors"
"log"
)
// ErrNilState is returned when the state is nil. // ErrNilState is returned when the state is nil.
var ErrNilState = errors.New("State not instantiated, please use discordgo.New() or assign Session.State.") var ErrNilState = errors.New("State not instantiated, please use discordgo.New() or assign Session.State.")
@ -429,14 +426,7 @@ func (s *State) MessageAdd(message *Message) error {
c.Messages = append(c.Messages, message) c.Messages = append(c.Messages, message)
if len(c.Messages) > s.MaxMessageCount { if len(c.Messages) > s.MaxMessageCount {
s.Unlock() c.Messages = c.Messages[len(c.Messages)-s.MaxMessageCount:]
for len(c.Messages) > s.MaxMessageCount {
err := s.MessageRemove(c.Messages[0])
if err != nil {
log.Println("message remove error: ", err)
}
}
s.Lock()
} }
return nil return nil
} }