From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 15 Feb 2008 18:34:42 +0000 (+0000)
Subject: Merged revisions 103726 via svnmerge from
X-Git-Tag: 1.6.0-beta3~2^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71646d663bcbd72aa65316de97f35591a921a003;p=thirdparty%2Fasterisk.git

Merged revisions 103726 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r103726 | russell | 2008-02-15 12:33:29 -0600 (Fri, 15 Feb 2008) | 6 lines

Don't attempt to execute the reload callback for a module that returned
AST_MODULE_LOAD_DECLINE.  This fixes a crash that was reported against
chan_console in trunk.

(closes issue #11953, reported by junky, fixed by me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103727 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/loader.c b/main/loader.c
index 3b73f43f91..08139af605 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -589,7 +589,7 @@ int ast_module_reload(const char *name)
 		if (name && resource_name_match(name, cur->resource))
 			continue;
 
-		if (!(cur->flags.running || cur->flags.declined))
+		if (!cur->flags.running || cur->flags.declined)
 			continue;
 
 		if (!info->reload) {	/* cannot be reloaded */