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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@275145 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/loader.c b/main/loader.c
index 704eb76e4007854d6585027803d8bd225795a421..d2a283f144e548546727adfb1516bdb285384d3c 100644 (file)
--- 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)) {