diff options
author | Adam <adam@sigterm.info> | 2015-09-06 17:00:44 -0400 |
---|---|---|
committer | Adam <adam@sigterm.info> | 2015-09-06 17:00:44 -0400 |
commit | 1aa4fa1496bd8a71ce6fe5f5f82eb4b951b0c131 (patch) | |
tree | 361acb333db2a6be4a29f34e402e4dbf9ef90dde | |
parent | b7189fdb5bdb2771e2d88ad29702ae4590e1a40a (diff) | |
parent | b0e64b8cea2d721588d92072a8d16fdd99a9c945 (diff) |
Merge pull request #1092 from SaberUK/insp20+fix-topic
[2.0] Fix sending the wrong numerics on join when a topic is empty.
-rw-r--r-- | src/channels.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index 9f1eafd0c..6802e3d7d 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -412,7 +412,7 @@ Channel* Channel::ForceChan(Channel* Ptr, User* user, const std::string &privs, if (IS_LOCAL(user)) { - if (Ptr->topicset) + if (!Ptr->topic.empty()) { 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); |