ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-19 15:39:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue where the last module to be loaded wasnt unloaded by restart

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6074 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2006-12-23 15:14:54 +00:00
parent f5f71bdfef
commit c1316150a7
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/inspircd.cpp
View File

@ -80,20 +80,20 @@ void InspIRCd::Restart(const std::string &reason)
/* This calls the constructor and closes the listening socket */ /* This calls the constructor and closes the listening socket */
delete Config->openSockfd[i]; delete Config->openSockfd[i];
/* We do this twice, so that any service providers get a chance to be /* We do this more than once, so that any service providers get a
* unhooked by the modules using them, but then get a chance to be * chance to be* unhooked by the modules using them, but then get
* removed themsleves. * a chance to be removed themsleves.
*/ */
for (int tries = 0; tries < 2; tries++) for (int tries = 0; tries < 3; tries++)
{ {
MyModCount = this->GetModuleCount(); MyModCount = this->GetModuleCount();
mymodnames.clear(); mymodnames.clear();
/* Unload all modules, so they get a chance to clean up their listeners */ /* 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]); 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()); this->UnloadModule(mymodnames[k].c_str());
} }

4
src/modules.cpp
View File

@ -328,6 +328,10 @@ std::pair<int,std::string> InspIRCd::GetInterfaceInstanceCount(Module* m)
const std::string& InspIRCd::GetModuleName(Module* m) const std::string& InspIRCd::GetModuleName(Module* m)
{ {
static std::string nothing = ""; /* Prevent compiler warning */ static std::string nothing = ""; /* Prevent compiler warning */
if (!this->GetModuleCount())
return nothing;
for (int i = 0; i <= this->GetModuleCount(); i++) for (int i = 0; i <= this->GetModuleCount(); i++)
{ {
if (this->modules[i] == m) if (this->modules[i] == m)