summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes1
-rw-r--r--src/modules.c8
-rw-r--r--version.log7
3 files changed, 11 insertions, 5 deletions
diff --git a/Changes b/Changes
index f249abf53..4b6d7f5de 100644
--- a/Changes
+++ b/Changes
@@ -15,6 +15,7 @@ Anope Version S V N
01/22 F Crash during first save when MySQL is enabled. [#672]
03/03 F SAs can no longer move other SAs down to ServicesOpers. [#690]
03/03 F We now send out UNKLINE on hybrid when /os akill del is issued. [#656]
+03/14 F /os modunload dosnt clear moduleData before calling AnopeFini. [ #00]
Anope Version 1.7.18
--------------------
diff --git a/src/modules.c b/src/modules.c
index e0d0f8556..70d4621c5 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -720,10 +720,6 @@ int unloadModule(Module * m, User * u)
return MOD_ERR_NOUNLOAD;
}
- if (prepForUnload(mod_current_module) != MOD_ERR_OK) {
- return MOD_ERR_UNKNOWN;
- }
-
func = (void (*)(void))ano_modsym(m->handle, "AnopeFini");
if (func) {
mod_current_module_name = m->name;
@@ -731,6 +727,10 @@ int unloadModule(Module * m, User * u)
mod_current_module_name = NULL;
}
+ if (prepForUnload(m) != MOD_ERR_OK) {
+ return MOD_ERR_UNKNOWN;
+ }
+
if ((ano_modclose(m->handle)) != 0) {
alog(ano_moderr());
if (u) {
diff --git a/version.log b/version.log
index 84dc5c2b5..1de0dd136 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,15 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="18"
VERSION_EXTRA="-svn"
-VERSION_BUILD="1230"
+VERSION_BUILD="1231"
# $Log$
#
+# BUILD : 1.7.18 (1231)
+# BUGS : N/A
+# NOTES : Ensure moduleData is still populated when anopeFini gets called when explicitaly unloading a single module.
+#
+#
# BUILD : 1.7.18 (1230)
# BUGS : 656
# NOTES : We now send out UNKLINE on hybridircd