Merge pull request #79 from mvrilo/master

Moving Lock() call in Rename
This commit is contained in:
Andrey Petrov 2014-12-17 10:04:26 -08:00
commit 59ed9a6bae

View File

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