From: Matthew Nicholson <mnicholson@digium.com>
Date: Fri, 9 Jul 2010 17:51:16 +0000 (+0000)
Subject: Merged revisions 275144 via svnmerge from
X-Git-Tag: 1.6.2.11-rc1~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d677066be987ef755cf4872b82a3607e3187eb2;p=thirdparty%2Fasterisk.git

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 704eb76e40..d2a283f144 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)) {