Remove a redundant check, and fix user-mode change propegation. (closes bug #574)

[user/henk/code/inspircd.git] / src / channels.cpp

diff --git a/src/channels.cpp b/src/channels.cpp
index ac7c461d6e12377bb047bfa6fd3d2dbf84b56024..2884b2d3b659afdc052e6d7e421bf396655427b6 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -74,7 +74,7 @@ std::string Channel::GetModeParameter(char mode)
 
 int Channel::SetTopic(User *u, std::string &ntopic, bool forceset)
 {
-       if (IS_LOCAL(u))
+       if (u && IS_LOCAL(u))
        {
                if(!forceset)
                {
@@ -102,11 +102,20 @@ int Channel::SetTopic(User *u, std::string &ntopic, bool forceset)
        }
 
        this->topic.assign(ntopic, 0, ServerInstance->Config->Limits.MaxTopic);
-       this->setby.assign(ServerInstance->Config->FullHostInTopic ? u->GetFullHost() : u->nick, 0, 128);
+       if (u)
+       {
+               this->setby.assign(ServerInstance->Config->FullHostInTopic ? u->GetFullHost() : u->nick, 0, 128);
+               this->WriteChannel(u, "TOPIC %s :%s", this->name.c_str(), this->topic.c_str());
+       }
+       else
+       {
+               this->setby.assign(ServerInstance->Config->ServerName);
+               this->WriteChannelWithServ(ServerInstance->Config->ServerName, "TOPIC %s :%s", this->name.c_str(), this->topic.c_str());
+       }
+
        this->topicset = ServerInstance->Time();
-       this->WriteChannel(u, "TOPIC %s :%s", this->name.c_str(), this->topic.c_str());
 
-       if (IS_LOCAL(u))
+       if (u && IS_LOCAL(u))
        {
                FOREACH_MOD(I_OnPostLocalTopicChange,OnPostLocalTopicChange(u, this, this->topic));
        }