[svn-commits] russell: trunk r103727 - in /trunk: ./ main/loader.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Feb 15 12:34:42 2008
New Revision: 103727

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103727
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/main/loader.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/loader.c
URL: http://svn.digium.com/view/asterisk/trunk/main/loader.c?view=diff&rev=103727&r1=103726&r2=103727
==============================================================================
--- trunk/main/loader.c (original)
+++ trunk/main/loader.c Fri Feb 15 12:34:42 2008
@@ -589,7 +589,7 @@
 		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 */