Fix broken stuff.

[user/henk/code/inspircd.git] / src / modules / m_permchannels.cpp

diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index 6a5373009f8c14c8f9f4ff3c0b8bf26bec372f71..3b3df4d262010d66622ab105e47eea5ad00b7536 100644 (file)
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -107,9 +107,9 @@ public:
                        std::string topic = MyConf.ReadValue("permchannels", "topic", i);
                        std::string modes = MyConf.ReadValue("permchannels", "modes", i);
 
-                       if (channel.empty() || topic.empty())
+                       if (channel.empty())
                        {
-                               ServerInstance->Logs->Log("blah", DEBUG, "Malformed permchannels tag with empty topic or channel name.");
+                               ServerInstance->Logs->Log("blah", DEBUG, "Malformed permchannels tag with empty channel name.");
                                continue;
                        }
 
@@ -118,7 +118,8 @@ public:
                        if (!c)
                        {
                                c = new Channel(ServerInstance, channel, ServerInstance->Time());
-                               c->SetTopic(NULL, topic, true);
+                               if (!topic.empty())
+                                       c->SetTopic(NULL, topic, true);
                                ServerInstance->Logs->Log("blah", DEBUG, "Added %s with topic %s", channel.c_str(), topic.c_str());
 
                                if (modes.empty())