diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-15 18:34:42 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-15 18:34:42 +0000 |
| commit | 22c23f6d6f846ce08d3b90f24e6980f7fd35209e (patch) | |
| tree | 341499731fdb989e88a77927a72b980bd2c21131 | |
| parent | e92a79cd30aedc2300ef4233079c3b1d7594a302 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@103727 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/loader.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/loader.c b/main/loader.c index 3b73f43f9..08139af60 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 */ |