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

fix #1252

Browse Source
This commit is contained in:
Shivaram Lingamneni 2020-08-29 23:40:49 -04:00
parent 3bcf67b956
commit 01726f8935
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
irc/client_lookup_set.go
View File

@ -48,9 +48,8 @@ func (clients *ClientManager) Get(nick string) *Client {
return nil return nil
} }
func (clients *ClientManager) removeInternal(client *Client) (err error) { func (clients *ClientManager) removeInternal(client *Client, oldcfnick, oldskeleton string) (err error) {
// requires holding the writable Lock() // requires holding the writable Lock()
oldcfnick, oldskeleton := client.uniqueIdentifiers()
if oldcfnick == "*" || oldcfnick == "" { if oldcfnick == "*" || oldcfnick == "" {
return errNickMissing return errNickMissing
} }
@ -88,7 +87,8 @@ func (clients *ClientManager) Remove(client *Client) error {
clients.Lock() clients.Lock()
defer clients.Unlock() defer clients.Unlock()
return clients.removeInternal(client) oldcfnick, oldskeleton := client.uniqueIdentifiers()
return clients.removeInternal(client, oldcfnick, oldskeleton)
} }
// Handles a RESUME by attaching a session to a designated client. It is the // Handles a RESUME by attaching a session to a designated client. It is the
@ -240,10 +240,11 @@ func (clients *ClientManager) SetNick(client *Client, session *Session, newNick
return "", errNicknameInUse, false return "", errNicknameInUse, false
} }
formercfnick, formerskeleton := client.uniqueIdentifiers()
if changeSuccess := client.SetNick(newNick, newCfNick, newSkeleton); !changeSuccess { if changeSuccess := client.SetNick(newNick, newCfNick, newSkeleton); !changeSuccess {
return "", errClientDestroyed, false return "", errClientDestroyed, false
} }
clients.removeInternal(client) clients.removeInternal(client, formercfnick, formerskeleton)
clients.byNick[newCfNick] = client clients.byNick[newCfNick] = client
clients.bySkeleton[newSkeleton] = client clients.bySkeleton[newSkeleton] = client
return newNick, nil, false return newNick, nil, false