diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-09 17:51:16 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-09 17:51:16 +0000 |
| commit | 563497e27cb0b42f2c4d6a37823f78988e24a928 (patch) | |
| tree | 4e520e358205c53eb3a5136160df8989dca09116 /main | |
| parent | 782e31e2a2dc64cc2c4bd526077179be91fa436c (diff) | |
Merged revisions 275144 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r275144 | mnicholson | 2010-07-09 12:50:45 -0500 (Fri, 09 Jul 2010) | 9 lines
Merged revisions 275143 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r275143 | mnicholson | 2010-07-09 12:50:05 -0500 (Fri, 09 Jul 2010) | 2 lines
don't unload modules that returned AST_MODULE_LOAD_DECLINE when they were loaded
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275145 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/loader.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/loader.c b/main/loader.c index 704eb76e4..d2a283f14 100644 --- a/main/loader.c +++ b/main/loader.c @@ -467,7 +467,7 @@ void ast_module_shutdown(void) continue; } AST_LIST_REMOVE_CURRENT(entry); - if (mod->info->unload) { + if (mod->flags.running && !mod->flags.declined && mod->info->unload) { mod->info->unload(); } AST_LIST_HEAD_DESTROY(&mod->users); @@ -494,7 +494,7 @@ int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode f return -1; } - if (!(mod->flags.running || mod->flags.declined)) + if (!mod->flags.running || mod->flags.declined) error = 1; if (!error && (mod->usecount > 0)) { |