Merged revisions 275186 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r275186 | mnicholson | 2010-07-09 13:24:03 -0500 (Fri, 09 Jul 2010) | 9 lines
  
  Merged revisions 275182 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r275182 | mnicholson | 2010-07-09 13:23:23 -0500 (Fri, 09 Jul 2010) | 2 lines
    
    give a better error message when attempting to unload a module that is not loaded
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@275191 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.2
Matthew Nicholson 16 years ago
parent d389e0b6bd
commit f6b650cfb8

@ -494,8 +494,10 @@ 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) {
ast_log(LOG_WARNING, "Unload failed, '%s' is not loaded.\n", resource_name);
error = 1;
}
if (!error && (mod->usecount > 0)) {
if (force)

Loading…
Cancel
Save