summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/channels.cpp4
-rw-r--r--src/commands/cmd_topic.cpp2
2 files changed, 1 insertions, 5 deletions
diff --git a/src/channels.cpp b/src/channels.cpp
index 6c70259bc..0ff1298c1 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -466,10 +466,6 @@ Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const
user->WriteNumeric(RPL_TOPIC, "%s %s :%s", user->nick.c_str(), Ptr->name.c_str(), Ptr->topic.c_str());
user->WriteNumeric(RPL_TOPICTIME, "%s %s %s %lu", user->nick.c_str(), Ptr->name.c_str(), Ptr->setby.c_str(), (unsigned long)Ptr->topicset);
}
- else
- {
- user->WriteNumeric(RPL_NOTOPICSET, "%s %s :No topic is set", user->nick.c_str(), Ptr->name.c_str());
- }
Ptr->UserList(user);
}
FOREACH_MOD_I(Instance,I_OnPostJoin,OnPostJoin(user, Ptr));
diff --git a/src/commands/cmd_topic.cpp b/src/commands/cmd_topic.cpp
index 280b24f4b..00b588179 100644
--- a/src/commands/cmd_topic.cpp
+++ b/src/commands/cmd_topic.cpp
@@ -48,7 +48,7 @@ CmdResult CommandTopic::Handle (const std::vector<std::string>& parameters, User
}
else
{
- user->WriteNumeric(331, "%s %s :No topic is set.", user->nick.c_str(), c->name.c_str());
+ user->WriteNumeric(RPL_NOTOPICSET, "%s %s :No topic is set.", user->nick.c_str(), c->name.c_str());
}
}
return CMD_SUCCESS;