From: Matthew Nicholson <mnicholson@digium.com>
Date: Fri, 9 Jul 2010 18:24:45 +0000 (+0000)
Subject: Merged revisions 275186 via svnmerge from
X-Git-Tag: 1.6.2.11-rc1~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6b650cfb8832e6f73a830e416b0616702675886;p=thirdparty%2Fasterisk.git

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
---

diff --git a/main/loader.c b/main/loader.c
index d2a283f144..f5b737d845 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -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)