diff options
| author | rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2007-03-14 17:08:27 +0000 |
|---|---|---|
| committer | rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2007-03-14 17:08:27 +0000 |
| commit | 6ab1b8f131628b12c26289eaf21a68a56c6afc41 (patch) | |
| tree | 1c48d0c1390b7eadb3245f54703e227d5d06d119 | |
| parent | 13c26383c99e8ee664898bc9dfc3a0ee0e9044f2 (diff) | |
BUILD : 1.7.18 (1231) BUGS : N/A NOTES : Ensure moduleData is still populated when anopeFini gets called when explicitaly unloading a single module.
git-svn-id: svn://svn.anope.org/anope/trunk@1231 31f1291d-b8d6-0310-a050-a5561fc1590b
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@950 5417fbe8-f217-4b02-8779-1006273d7864
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | src/modules.c | 8 | ||||
| -rw-r--r-- | version.log | 7 |
3 files changed, 11 insertions, 5 deletions
@@ -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 |