diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.cpp | 9 | ||||
| -rw-r--r-- | src/init.cpp | 2 | ||||
| -rw-r--r-- | src/nickalias.cpp | 4 | ||||
| -rw-r--r-- | src/nickcore.cpp | 4 | ||||
| -rw-r--r-- | src/regchannel.cpp | 4 | ||||
| -rw-r--r-- | src/version.sh | 2 |
6 files changed, 16 insertions, 9 deletions
diff --git a/src/config.cpp b/src/config.cpp index 03ee9feb6..65a2c756c 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -665,6 +665,11 @@ const Anope::string &File::GetName() const return this->name; } +Anope::string File::GetPath() const +{ + return (this->executable ? "" : Anope::ConfigDir + "/") + this->name; +} + bool File::IsOpen() const { return this->fp != NULL; @@ -722,14 +727,14 @@ void Conf::LoadConf(File &file) return; if (!file.Open()) - throw ConfigException("File " + file.GetName() + " could not be opened."); + throw ConfigException("File " + file.GetPath() + " could not be opened."); Anope::string itemname, wordbuffer; std::stack<Block *> block_stack; int linenumber = 0; bool in_word = false, in_quote = false, in_comment = false; - Log(LOG_DEBUG) << "Start to read conf " << file.GetName(); + Log(LOG_DEBUG) << "Start to read conf " << file.GetPath(); // Start reading characters... while (!file.End()) { diff --git a/src/init.cpp b/src/init.cpp index 515f610f2..57c207eae 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -553,6 +553,8 @@ void Anope::Init(int ac, char **av) static_cast<void>(MOD_RESULT); Log() << "Databases loaded"; + FOREACH_MOD(OnPostInit, ()); + for (channel_map::const_iterator it = ChannelList.begin(), it_end = ChannelList.end(); it != it_end; ++it) it->second->Sync(); diff --git a/src/nickalias.cpp b/src/nickalias.cpp index 653e9461b..6e68ba4a6 100644 --- a/src/nickalias.cpp +++ b/src/nickalias.cpp @@ -50,10 +50,10 @@ NickAlias::NickAlias(const Anope::string &nickname, NickCore* nickcore) : Serial NickAlias::~NickAlias() { - UnsetExtensibles(); - FOREACH_MOD(OnDelNick, (this)); + UnsetExtensibles(); + /* Accept nicks that have no core, because of database load functions */ if (this->nc) { diff --git a/src/nickcore.cpp b/src/nickcore.cpp index cede8b6e4..e35ef8010 100644 --- a/src/nickcore.cpp +++ b/src/nickcore.cpp @@ -37,10 +37,10 @@ NickCore::NickCore(const Anope::string &coredisplay) : Serializable("NickCore"), NickCore::~NickCore() { - UnsetExtensibles(); - FOREACH_MOD(OnDelCore, (this)); + UnsetExtensibles(); + if (!this->chanaccess->empty()) Log(LOG_DEBUG) << "Non-empty chanaccess list in destructor!"; diff --git a/src/regchannel.cpp b/src/regchannel.cpp index 9502d2116..019d84046 100644 --- a/src/regchannel.cpp +++ b/src/regchannel.cpp @@ -140,10 +140,10 @@ ChannelInfo::ChannelInfo(const ChannelInfo &ci) : Serializable("ChannelInfo"), ChannelInfo::~ChannelInfo() { - UnsetExtensibles(); - FOREACH_MOD(OnDelChan, (this)); + UnsetExtensibles(); + Log(LOG_DEBUG) << "Deleting channel " << this->name; if (this->c) diff --git a/src/version.sh b/src/version.sh index 8fe971e6e..6050a8a6e 100644 --- a/src/version.sh +++ b/src/version.sh @@ -2,5 +2,5 @@ VERSION_MAJOR=2 VERSION_MINOR=0 -VERSION_PATCH=6 +VERSION_PATCH=7 VERSION_EXTRA="-git" |