moving Lock() call

This commit is contained in:
Murilo Santana 2014-12-17 09:26:29 -02:00
parent 99c2cf1756
commit a160bc9bac

View File

@ -222,12 +222,12 @@ func (s *Server) proposeName(name string) (string, error) {
// Rename renames the given client (user) // Rename renames the given client (user)
func (s *Server) Rename(client *Client, newName string) { func (s *Server) Rename(client *Client, newName string) {
s.Lock()
var oldName string var oldName string
if strings.ToLower(newName) == strings.ToLower(client.Name) { if strings.ToLower(newName) == strings.ToLower(client.Name) {
oldName = client.Name oldName = client.Name
client.Rename(newName) client.Rename(newName)
} else { } else {
s.Lock()
newName, err := s.proposeName(newName) newName, err := s.proposeName(newName)
if err != nil { if err != nil {
client.SysMsg("%s", err) client.SysMsg("%s", err)