GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-10 22:19:31 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #452 from slingamn/deadlock

Browse Source 
fix a deadlock in CS AMODE
This commit is contained in:
Daniel Oaks 2019-04-07 17:10:42 +10:00 committed by GitHub
commit c5dd87a64d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
irc/modes.go
View File

@ -261,6 +261,13 @@ func (channel *Channel) ProcessAccountToUmodeChange(client *Client, change modes
return l == r || umodeGreaterThan(l, r) return l == r || umodeGreaterThan(l, r)
} }
changed := false
defer func() {
if changed {
channel.MarkDirty(IncludeLists)
}
}()
account := client.Account() account := client.Account()
isOperChange := client.HasRoleCapabs("chanreg") isOperChange := client.HasRoleCapabs("chanreg")
@ -290,14 +297,14 @@ func (channel *Channel) ProcessAccountToUmodeChange(client *Client, change modes
case modes.Add: case modes.Add:
if targetModeNow != targetModeAfter { if targetModeNow != targetModeAfter {
channel.accountToUMode[change.Arg] = change.Mode channel.accountToUMode[change.Arg] = change.Mode
channel.MarkDirty(IncludeLists) changed = true
return []modes.ModeChange{change}, nil return []modes.ModeChange{change}, nil
} }
return nil, nil return nil, nil
case modes.Remove: case modes.Remove:
if targetModeNow == change.Mode { if targetModeNow == change.Mode {
delete(channel.accountToUMode, change.Arg) delete(channel.accountToUMode, change.Arg)
channel.MarkDirty(IncludeLists) changed = true
return []modes.ModeChange{change}, nil return []modes.ModeChange{change}, nil
} }
return nil, nil return nil, nil