CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests Activity

modes: Fix some more mutexes

Browse source
This commit is contained in:
Daniel Oaks 2017-01-11 12:26:58 +10:00
parent c39bebc696
commit e9324c3250
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
irc/channel.go
View file

@ -185,10 +185,10 @@ func (channel *Channel) Nick() string {
}
// <mode> <mode params>
func (channel *Channel) ModeString(client *Client) (str string) {
channel.membersMutex.RLock()
func (channel *Channel) modeStringNoLock(client *Client) (str string) {
// RLock()
isMember := client.flags[Operator] || channel.members.Has(client)
channel.membersMutex.RUnlock()
// RUnlock()
showKey := isMember && (channel.key != "")
showUserLimit := channel.userLimit > 0
@ -436,10 +436,9 @@ func (channel *Channel) applyModeFlag(client *Client, mode ChannelMode,
return false
}
func (channel *Channel) applyModeMember(client *Client, mode ChannelMode,
func (channel *Channel) applyModeMemberNoMutex(client *Client, mode ChannelMode,
op ModeOp, nick string) *ChannelModeChange {
channel.membersMutex.Lock()
defer channel.membersMutex.Unlock()
// requires Lock()
if nick == "" {
//TODO(dan): shouldn't this be handled before it reaches this function?