Fix m_permchannels not prepending the path when reading the config.

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index 7d7fba26ca3dcd5c81213a58ca9fdea80ef317c4..cfd55d84e6b65e50c6df7d4fbb95cb51411c3e3c 100644 (file)
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -1344,8 +1344,8 @@
 #
 # If 'listmodes' is true then all list modes (+b, +I, +e, +g...) will be
 # saved. Defaults to false.
-#<permchanneldb filename="data/permchannels.conf" listmodes="true">
-#<include file="data/permchannels.conf">
+#<permchanneldb filename="permchannels.conf" listmodes="true">
+#<include file="permchannels.conf">
 #
 # You may also create channels on startup by using the <permchannels> block.
 # Don't forget to set them +P in the modes, or they won't stay permanent.

diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index edb752f671d633f340c61c2bc452e6f04c9940c8..0c73de7baf75921ba95169140b6f0fa61b8ab803 100644 (file)
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -205,6 +205,9 @@ public:
                ConfigTag* tag = ServerInstance->Config->ConfValue("permchanneldb");
                permchannelsconf = tag->getString("filename");
                save_listmodes = tag->getBool("listmodes");
+
+               if (!permchannelsconf.empty())
+                       permchannelsconf = ServerInstance->Config->Paths.PrependConfig(permchannelsconf);
        }
 
        void LoadDatabase()