diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.cpp | 1 | ||||
| -rw-r--r-- | src/module.cpp | 2 | ||||
| -rw-r--r-- | src/regchannel.cpp | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/config.cpp b/src/config.cpp index 375a097ce..e0cd21b68 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -1255,6 +1255,7 @@ ConfigItems::ConfigItems(ServerConfig *conf) {"chanserv", "nomlock", "", new ValueContainerString(&conf->NoMLock), DT_STRING, NoValidation}, {"chanserv", "require", "", new ValueContainerString(&conf->CSRequire), DT_STRING, NoValidation}, {"chanserv", "use_server_side_mlock", "yes", new ValueContainerBool(&conf->UseServerSideMLock), DT_BOOLEAN, NoValidation}, + {"chanserv", "use_server_side_topiclock", "yes", new ValueContainerBool(&conf->UseServerSideTopicLock), DT_BOOLEAN, NoValidation}, {"memoserv", "name", "", new ValueContainerString(&conf->MemoServ), DT_STRING, NoValidation}, {"memoserv", "maxmemos", "0", new ValueContainerUInt(&conf->MSMaxMemos), DT_UINTEGER, NoValidation}, {"memoserv", "senddelay", "0", new ValueContainerTime(&conf->MSSendDelay), DT_TIME, NoValidation}, diff --git a/src/module.cpp b/src/module.cpp index c08d25aff..2f70cb96b 100644 --- a/src/module.cpp +++ b/src/module.cpp @@ -33,7 +33,7 @@ Module::Module(const Anope::string &modname, const Anope::string &, ModType modt #if GETTEXT_FOUND for (unsigned i = 0; i < languages.size(); ++i) - if (IsFile("languages/" + languages[i] + "/LC_MESSAGES/" + modname + ".mo")) + if (IsFile(locale_dir + "/" + languages[i] + "/LC_MESSAGES/" + modname + ".mo")) { if (!bindtextdomain(this->name.c_str(), locale_dir.c_str())) Log() << "Error calling bindtextdomain, " << Anope::LastError(); diff --git a/src/regchannel.cpp b/src/regchannel.cpp index 1e0014454..ccb2235b3 100644 --- a/src/regchannel.cpp +++ b/src/regchannel.cpp @@ -235,7 +235,6 @@ ChannelInfo::ChannelInfo(const Anope::string &chname) : Flags<ChannelInfoFlag, C this->founder = NULL; this->successor = NULL; - this->last_topic_time = 0; this->c = findchan(chname); if (this->c) this->c->ci = this; @@ -244,6 +243,9 @@ ChannelInfo::ChannelInfo(const Anope::string &chname) : Flags<ChannelInfoFlag, C this->repeattimes = 0; this->bi = NULL; + this->last_topic_setter = Config->ChanServ; + this->last_topic_time = Anope::CurTime; + this->name = chname; size_t t; |