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.4@275143 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/loader.c

@@ -472,7 +472,7 @@ void ast_module_shutdown(void)
 				continue;
 			}
 			AST_LIST_REMOVE_CURRENT(&module_list, entry);
-			if (mod->info->unload) {
+			if (mod->flags.running && !mod->flags.declined && mod->info->unload) {
 				mod->info->unload();
 			}
 			AST_LIST_HEAD_DESTROY(&mod->users);
@@ -498,7 +498,7 @@ int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode f
 		return 0;
 	}
 
-	if (!(mod->flags.running || mod->flags.declined))
+	if (!mod->flags.running || mod->flags.declined)
 		error = 1;
 
 	if (!mod->lib) {