diff options
| -rw-r--r-- | src/inspircd.cpp | 12 | ||||
| -rw-r--r-- | src/modules.cpp | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/inspircd.cpp b/src/inspircd.cpp index b74fb4046..876bf7f29 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -80,20 +80,20 @@ void InspIRCd::Restart(const std::string &reason) /* This calls the constructor and closes the listening socket */ delete Config->openSockfd[i]; - /* We do this twice, so that any service providers get a chance to be - * unhooked by the modules using them, but then get a chance to be - * removed themsleves. + /* We do this more than once, so that any service providers get a + * chance to be* unhooked by the modules using them, but then get + * a chance to be removed themsleves. */ - for (int tries = 0; tries < 2; tries++) + for (int tries = 0; tries < 3; tries++) { MyModCount = this->GetModuleCount(); mymodnames.clear(); /* Unload all modules, so they get a chance to clean up their listeners */ - for (int j = 0; j < ModCount; j++) + for (int j = 0; j <= MyModCount; j++) mymodnames.push_back(Config->module_names[j]); - for (int k = 0; k < MyModCount; k++) + for (int k = 0; k <= MyModCount; k++) this->UnloadModule(mymodnames[k].c_str()); } diff --git a/src/modules.cpp b/src/modules.cpp index 773f87f66..8c38914e9 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -328,6 +328,10 @@ std::pair<int,std::string> InspIRCd::GetInterfaceInstanceCount(Module* m) const std::string& InspIRCd::GetModuleName(Module* m) { static std::string nothing = ""; /* Prevent compiler warning */ + + if (!this->GetModuleCount()) + return nothing; + for (int i = 0; i <= this->GetModuleCount(); i++) { if (this->modules[i] == m) |