[svn-commits] file: trunk r89600 - in /trunk: ./ res/res_features.c

[SVN commits to the Digium repositories]

Author: file
Date: Mon Nov 26 12:04:46 2007
New Revision: 89600

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89600
Log:
Merged revisions 89599 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89599 | file | 2007-11-26 14:02:56 -0400 (Mon, 26 Nov 2007) | 6 lines

Add module counting removal for error conditions.
(closes issue #11333)
Reported by: Laureano
Patches:
      res_features_v2.c.patch uploaded by Laureano (license 265)

........

Modified:
    trunk/   (props changed)
    trunk/res/res_features.c

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

Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?view=diff&rev=89600&r1=89599&r2=89600
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Mon Nov 26 12:04:46 2007
@@ -2336,6 +2336,7 @@
 			if (error) {
 				ast_log(LOG_WARNING, "Failed to play courtesy tone!\n");
 				ast_hangup(peer);
+				ast_module_user_remove(u);
 				return -1;
 			}
 		} else
@@ -2345,6 +2346,7 @@
 		if (res < 0) {
 			ast_log(LOG_WARNING, "Could not make channels %s and %s compatible for bridge\n", chan->name, peer->name);
 			ast_hangup(peer);
+			ast_module_user_remove(u);
 			return -1;
 		}
 		/* This runs sorta backwards, since we give the incoming channel control, as if it
@@ -2370,6 +2372,7 @@
 		/* Simulate the PBX hanging up */
 		if (res != AST_PBX_NO_HANGUP_PEER)
 			ast_hangup(peer);
+		ast_module_user_remove(u);
 		return res;
 	} else {
 		/*! \todo XXX Play a message XXX */