diff options
| author |  Sadie Powell | 2019-02-05 00:47:30 +0000 |
|---|---|---|
| committer | Sadie Powell | 2019-02-05 00:47:30 +0000 |
| commit | bfa5fb407e13ad4adb5c062021de50ecd760ed95 (patch) | |
| tree | c573269b1a94fd7e7da27c1b90b05fa60916de23 /src/users.cpp | |
| parent | Remove support for the deprecated <power> config tag. (diff) | |
| parent | ModuleManager: use std::flush instead of fflush(stdout). (diff) | |
| download | inspircd++-bfa5fb407e13ad4adb5c062021de50ecd760ed95.tar.gz inspircd++-bfa5fb407e13ad4adb5c062021de50ecd760ed95.tar.bz2 inspircd++-bfa5fb407e13ad4adb5c062021de50ecd760ed95.zip | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/users.cpp')
| -rw-r--r-- | src/users.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/users.cpp b/src/users.cpp index b24a44d1d..a9bed86ea 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -1013,7 +1013,7 @@ bool User::ChangeDisplayedHost(const std::string& shost) this->InvalidateCache(); - if (IS_LOCAL(this)) + if (IS_LOCAL(this) && this->registered != REG_NONE) this->WriteNumeric(RPL_YOURDISPLAYEDHOST, this->GetDisplayedHost(), "is now your displayed host"); return true; @@ -1026,7 +1026,7 @@ void User::ChangeRealHost(const std::string& host, bool resetdisplay) const bool changehost = (realhost != host); if (!changehost && !resetdisplay) return; - + // If the displayhost is not set and we are not resetting it then // we need to copy it to the displayhost field. if (displayhost.empty() && !resetdisplay) |