summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>2010-05-06 00:56:29 +0000
committerAdam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>2010-05-06 00:56:29 +0000
commit8e59e5898763913a3db504538dd21595c0618bbb (patch)
tree869042e0e9aa858521c447281eac26faafd84ac9
parentde902c6db3923facb7393fc63a315a04fe580434 (diff)
Fixed unloading modules commands, fixes a crash introduced by the last commit
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2935 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--src/modules.c6
-rw-r--r--version.log3
2 files changed, 6 insertions, 3 deletions
diff --git a/src/modules.c b/src/modules.c
index 728575005..36a11052c 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -754,8 +754,6 @@ int unloadModule(Module * m, User * u)
mod_current_module = m;
mod_current_module_name = m->name;
func(); /* exec AnopeFini */
- mod_current_module = NULL;
- mod_current_module_name = NULL;
}
if (prepForUnload(m) != MOD_ERR_OK) {
@@ -767,6 +765,8 @@ int unloadModule(Module * m, User * u)
if (u) {
notice_lang(s_OperServ, u, OPER_MODULE_REMOVE_FAIL, m->name);
}
+ mod_current_module = NULL;
+ mod_current_module_name = NULL;
return MOD_ERR_NOUNLOAD;
} else {
if (u) {
@@ -775,6 +775,8 @@ int unloadModule(Module * m, User * u)
notice_lang(s_OperServ, u, OPER_MODULE_UNLOADED, m->name);
}
delModule(m);
+ mod_current_module = NULL;
+ mod_current_module_name = NULL;
return MOD_ERR_OK;
}
#else
diff --git a/version.log b/version.log
index 8d726b424..f55cc6d63 100644
--- a/version.log
+++ b/version.log
@@ -9,9 +9,10 @@ VERSION_MAJOR="1"
VERSION_MINOR="8"
VERSION_PATCH="4"
VERSION_EXTRA="-svn"
-VERSION_BUILD="2931"
+VERSION_BUILD="2935"
# $Log$ # Changes since the 1.8.4 Release
+#Revision 2935 - Fixed unloading modules commands, fixes a crash introduced by the last commit
#Revision 2931 - Always set mod_current_module and mod_current_module_name, fixes a few of the functions in modules.c relying on it.
#Revision 2930 - Print an error if the TS6 SID isn't set/is set incorrectly, most people don't know how to work logfiles
#Revision 2929 - Added an internal event called when a nick is requested