dect
/
asterisk
Archived
13
0
Fork 0

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)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89600 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
file 2007-11-26 18:04:46 +00:00
parent 4d2ea03db9
commit b2469bcae6
1 changed files with 3 additions and 0 deletions

View File

@ -2336,6 +2336,7 @@ static int park_exec(struct ast_channel *chan, void *data)
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 @@ static int park_exec(struct ast_channel *chan, void *data)
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 @@ static int park_exec(struct ast_channel *chan, void *data)
/* 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 */