summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/conf/services/generic.conf.example2
-rw-r--r--src/configreader.cpp4
-rw-r--r--src/modules.cpp10
3 files changed, 13 insertions, 3 deletions
diff --git a/docs/conf/services/generic.conf.example b/docs/conf/services/generic.conf.example
index 6904d31d8..93b89ea0c 100644
--- a/docs/conf/services/generic.conf.example
+++ b/docs/conf/services/generic.conf.example
@@ -1,6 +1,8 @@
# This file contains aliases and nickname reservations which are used
# by all common services implementations.
+<module name="alias">
+
# Long hand aliases for services pseudoclients.
<alias text="BOTSERV" replace="PRIVMSG $requirement :$2-" requires="BotServ" uline="yes">
<alias text="CHANSERV" replace="PRIVMSG $requirement :$2-" requires="ChanServ" uline="yes">
diff --git a/src/configreader.cpp b/src/configreader.cpp
index be3707a16..6471413e0 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -726,6 +726,10 @@ void ServerConfig::ApplyModules(User* user)
for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
{
+ // Skip modules which are already loaded.
+ if (ServerInstance->Modules->Find(*adding))
+ continue;
+
if (ServerInstance->Modules->Load(*adding))
{
ServerInstance->SNO->WriteGlobalSno('a', "*** REHASH LOADED MODULE: %s",adding->c_str());
diff --git a/src/modules.cpp b/src/modules.cpp
index 5c5e5c5c0..6d0d3bf94 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -468,10 +468,14 @@ void ModuleManager::LoadAll()
for (ConfigIter i = tags.first; i != tags.second; ++i)
{
ConfigTag* tag = i->second;
- std::string name = tag->getString("name");
- this->NewServices = &servicemap[ExpandModName(name)];
- std::cout << "[" << con_green << "*" << con_reset << "] Loading module:\t" << con_green << name << con_reset << std::endl;
+ std::string name = ExpandModName(tag->getString("name"));
+ this->NewServices = &servicemap[name];
+
+ // Skip modules which are already loaded.
+ if (Modules.find(name) != Modules.end())
+ continue;
+ std::cout << "[" << con_green << "*" << con_reset << "] Loading module:\t" << con_green << name << con_reset << std::endl;
if (!this->Load(name, true))
{
ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, this->LastError());