diff options
author | Peter Powell <petpow@saberuk.com> | 2014-03-07 15:47:52 +0000 |
---|---|---|
committer | Attila Molnar <attilamolnar@hush.com> | 2014-03-07 18:28:01 +0100 |
commit | 9ccb36800a6512d9aaa0b429eca0b94d7caa0d33 (patch) | |
tree | c8b904473dba6e25fca88e178ec3c75839bbf033 | |
parent | b15cffc167391fc8af6cab52061d4b591ec5bbf8 (diff) |
Fix m_permchannels not prepending the path when reading the config.
-rw-r--r-- | docs/conf/modules.conf.example | 4 | ||||
-rw-r--r-- | src/modules/m_permchannels.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example index 7d7fba26c..cfd55d84e 100644 --- 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 edb752f67..0c73de7ba 100644 --- 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() |