diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-07-03 12:32:21 +0200 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-07-03 12:32:21 +0200 |
| commit | e827ec50d89e296ea6b19807631b56ed80e869a7 (patch) | |
| tree | 8915781b9b361031c2b09ea797df49ff4251c015 /src | |
| parent | 43063e15a27298a89c4f1ca592747fc417fa11b5 (diff) | |
Get rid of irc::strings (assign()) in User::ChangeNick()
Diffstat (limited to 'src')
| -rw-r--r-- | src/users.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/users.cpp b/src/users.cpp index b52ca9aa3..abe0f8804 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -619,7 +619,8 @@ bool User::ChangeNick(const std::string& newnick, time_t newts) return false; } - if (assign(newnick) == assign(nick)) + User* const InUse = ServerInstance->FindNickOnly(newnick); + if (InUse == this) { // case change, don't need to check campers // and, if it's identical including case, we can leave right now @@ -638,8 +639,7 @@ bool User::ChangeNick(const std::string& newnick, time_t newts) * If the guy using the nick is already using it, tell the incoming nick change to gtfo, * because the nick is already (rightfully) in use. -- w00t */ - User* InUse = ServerInstance->FindNickOnly(newnick); - if (InUse && (InUse != this)) + if (InUse) { if (InUse->registered != REG_ALL) { |